From d5f3636a52d927ee44fa1686ca284cd32b62a0df Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 22 Jul 2004 22:18:45 +0000 Subject: - Fixed a few variable return types for some system calls. Made configure check for ssize_t to make it possible to use that when receiving the send() error code. This is necessary to prevent compiler warnings on some systems. - Made configure create config.h, and all source files now include setup.h that might include the proper config.h (or a handicrafted alternative). - Switched to 'ares_socket_t' type for sockets in ares, since Windows don't use 'int' for that. - automake-ified and libool-ified c-ares. Now it builds libcares as a shared lib on most platforms if wanted. (This bloated the size of the release archive with another 200K!) - Makefile.am now uses Makefile.inc for the c sources, h headers and man pages, to make it easier for other makefiles to use the exact same set of files. - Adjusted 'maketgz' to use the new automake magic when building distribution archives. --- setup.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 setup.h (limited to 'setup.h') diff --git a/setup.h b/setup.h new file mode 100644 index 0000000..eca1c90 --- /dev/null +++ b/setup.h @@ -0,0 +1,44 @@ +#ifndef ARES_SETUP_H +#define ARES_SETUP_H + +/* Copyright (C) 2004 by Daniel Stenberg et al + * + * Permission to use, copy, modify, and distribute this software and its + * documentation for any purpose and without fee is hereby granted, provided + * that the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of M.I.T. not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. M.I.T. makes no representations about the + * suitability of this software for any purpose. It is provided "as is" + * without express or implied warranty. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#else +/* simple work-around for now, for systems without configure support */ +#define ssize_t int +#endif + +/* Recent autoconf versions define these symbols in config.h. We don't want + them (since they collide with the libcurl ones when we build + --enable-debug) so we undef them again here. */ +#undef PACKAGE_STRING +#undef PACKAGE_TARNAME +#undef PACKAGE_VERSION +#undef PACKAGE_BUGREPORT +#undef PACKAGE_NAME +#undef VERSION +#undef PACKAGE + +/* now typedef our socket type */ +#ifdef WIN32 +typedef SOCKET ares_socket_t; +#define ARES_SOCKET_BAD INVALID_SOCKET +#else +typedef int ares_socket_t; +#define ARES_SOCKET_BAD -1 +#endif + +#endif /* ARES_SETUP_H */ -- cgit v1.2.3