From bc8590aa12b93f2df1ad20f53f4cce39724d140e Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Sat, 17 Dec 2005 20:37:53 +0000 Subject: [PATCH] Windows related cleanup --- ares/setup.h | 81 +++++++++++++++++++++++++++++++++++----------------- lib/setup.h | 55 ++++++++++++++++++----------------- src/setup.h | 55 +++++++++++++++++++---------------- 3 files changed, 114 insertions(+), 77 deletions(-) diff --git a/ares/setup.h b/ares/setup.h index 05eb76b3d..69081a899 100644 --- a/ares/setup.h +++ b/ares/setup.h @@ -1,5 +1,5 @@ -#ifndef ARES_SETUP_H -#define ARES_SETUP_H +#ifndef __ARES_SETUP_H +#define __ARES_SETUP_H /* Copyright (C) 2004 - 2005 by Daniel Stenberg et al * @@ -14,6 +14,21 @@ * without express or implied warranty. */ +#if !defined(WIN32) && defined(__WIN32__) +/* Borland fix */ +#define WIN32 +#endif + +#if !defined(WIN32) && defined(_WIN32) +/* VS2005 on x64 fix */ +#define WIN32 +#endif + +/* + * Include configuration script results or hand-crafted + * configuration file for platforms which lack config tool. + */ + #ifdef HAVE_CONFIG_H #include "config.h" #else @@ -22,6 +37,7 @@ #include "config-win32.h" #endif +#endif /* HAVE_CONFIG_H */ /* * Include header files for windows builds before redefining anything. @@ -30,38 +46,46 @@ * to any other further and independant block. */ -#ifdef WIN32 -# ifdef HAVE_WINDOWS_H -# ifndef WIN32_LEAN_AND_MEAN -# define WIN32_LEAN_AND_MEAN +#ifdef HAVE_WINDOWS_H +# ifndef WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +# endif +# include +# ifdef HAVE_WINSOCK2_H +# include +# ifdef HAVE_WS2TCPIP_H +# include # endif -# include -# ifdef HAVE_WINSOCK2_H -# include -# ifdef HAVE_WS2TCPIP_H -# include -# endif -# else -# ifdef HAVE_WINSOCK_H -# include -# endif +# else +# ifdef HAVE_WINSOCK_H +# include # endif # endif #endif +/+ + * Work-arounds for systems without configure support + */ -/* simple work-around for now, for systems without configure support */ -#ifndef __DJGPP__ +#ifndef HAVE_CONFIG_H + +#if defined(__DJGPP__) || (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) +#else #define ssize_t int #endif -#ifndef _MSC_VER + +#ifndef HAVE_WS2TCPIP_H #define socklen_t int #endif -#endif /* HAVE_CONFIG_H */ -/* 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. */ +#endif /* HAVE_CONFIG_H */ + +/* + * 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 @@ -70,7 +94,10 @@ #undef VERSION #undef PACKAGE -/* now typedef our socket type */ +/* + * Typedef our socket type + */ + #if defined(WIN32) && !defined(WATT32) typedef SOCKET ares_socket_t; #define ARES_SOCKET_BAD INVALID_SOCKET @@ -79,8 +106,10 @@ typedef int ares_socket_t; #define ARES_SOCKET_BAD -1 #endif -/* Assume a few thing unless they're set by configure +/* + * Assume a few thing unless they're set by configure */ + #if !defined(HAVE_SYS_TIME_H) && !defined(_MSC_VER) #define HAVE_SYS_TIME_H #endif @@ -115,4 +144,4 @@ int ares_strcasecmp(const char *s1, const char *s2); #endif #endif -#endif /* ARES_SETUP_H */ +#endif /* __ARES_SETUP_H */ diff --git a/lib/setup.h b/lib/setup.h index 768dfa54c..e9834df25 100644 --- a/lib/setup.h +++ b/lib/setup.h @@ -34,36 +34,41 @@ #endif /* HTTP_ONLY */ #if !defined(WIN32) && defined(__WIN32__) -/* This should be a good Borland fix. */ -#define WIN32 -#endif -#if !defined(WIN32) && defined(_WIN32) -/* This works for VS2005 on x64 */ +/* Borland fix */ #define WIN32 #endif +#if !defined(WIN32) && defined(_WIN32) +/* VS2005 on x64 fix */ +#define WIN32 +#endif + +/* + * Include configuration script results or hand-crafted + * configuration file for platforms which lack config tool. + */ + #ifdef HAVE_CONFIG_H -#include "config.h" /* the configure script results */ +#include "config.h" #else + #ifdef _WIN32_WCE #include "config-win32ce.h" #else #ifdef WIN32 -/* hand-modified win32 config.h! */ #include "config-win32.h" -#endif /* WIN32 */ -#endif /* WIN32_WCE */ -#endif /* HAVE_CONFIG_H */ +#endif +#endif #ifdef macintosh -/* hand-modified MacOS config.h! */ #include "config-mac.h" #endif + #ifdef AMIGA -/* hand-modified AmigaOS config.h! */ #include "amigaos.h" #endif +#endif /* HAVE_CONFIG_H */ /* * Include header files for windows builds before redefining anything. @@ -72,21 +77,19 @@ * to any other further and independant block. */ -#ifdef WIN32 -# ifdef HAVE_WINDOWS_H -# ifndef WIN32_LEAN_AND_MEAN -# define WIN32_LEAN_AND_MEAN +#ifdef HAVE_WINDOWS_H +# ifndef WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +# endif +# include +# ifdef HAVE_WINSOCK2_H +# include +# ifdef HAVE_WS2TCPIP_H +# include # endif -# include -# ifdef HAVE_WINSOCK2_H -# include -# ifdef HAVE_WS2TCPIP_H -# include -# endif -# else -# ifdef HAVE_WINSOCK_H -# include -# endif +# else +# ifdef HAVE_WINSOCK_H +# include # endif # endif #endif diff --git a/src/setup.h b/src/setup.h index 4cc41dd87..934ce9ca1 100644 --- a/src/setup.h +++ b/src/setup.h @@ -1,5 +1,5 @@ -#ifndef __CLIENT_SETUP_H -#define __CLIENT_SETUP_H +#ifndef __SRC_CURL_SETUP_H +#define __SRC_CURL_SETUP_H /*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | @@ -29,29 +29,38 @@ /* Borland fix */ #define WIN32 #endif + #if !defined(WIN32) && defined(_WIN32) -/* This works for VS2005 on x64 */ +/* VS2005 on x64 fix */ #define WIN32 #endif +/* + * Include configuration script results or hand-crafted + * configuration file for platforms which lack config tool. + */ + #ifdef HAVE_CONFIG_H -#include "config.h" /* the configure script results */ +#include "config.h" #else + #ifdef WIN32 -/* include the hand-modified win32 adjusted config.h! */ #include "config-win32.h" #endif + #ifdef macintosh -/* this is not the same as Mac OS X */ #include "config-mac.h" #endif + #ifdef __riscos__ #include "config-riscos.h" #endif + #ifdef __amigaos__ #include "config-amigaos.h" #endif -#endif + +#endif /* HAVE_CONFIG_H */ #if defined(CURLDEBUG) && defined(CURLTOOLDEBUG) /* This is an ugly hack for CURLDEBUG conditions only. We need to include @@ -60,7 +69,6 @@ #include "../lib/setup.h" #endif - /* * Include header files for windows builds before redefining anything. * Use this preproessor block only to include or exclude windows.h, @@ -68,26 +76,23 @@ * to any other further and independant block. */ -#ifdef WIN32 -# ifdef HAVE_WINDOWS_H -# ifndef WIN32_LEAN_AND_MEAN -# define WIN32_LEAN_AND_MEAN +#ifdef HAVE_WINDOWS_H +# ifndef WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +# endif +# include +# ifdef HAVE_WINSOCK2_H +# include +# ifdef HAVE_WS2TCPIP_H +# include # endif -# include -# ifdef HAVE_WINSOCK2_H -# include -# ifdef HAVE_WS2TCPIP_H -# include -# endif -# else -# ifdef HAVE_WINSOCK_H -# include -# endif +# else +# ifdef HAVE_WINSOCK_H +# include # endif # endif #endif - #include #ifdef __TANDEM @@ -102,7 +107,7 @@ #endif #if !defined(__cplusplus) && !defined(__BEOS__) && !defined(typedef_bool) -typedef char bool; +typedef unsigned char bool; #define typedef_bool #endif @@ -157,4 +162,4 @@ int fileno( FILE *stream); #define SIZEOF_CURL_OFF_T sizeof(curl_off_t) #endif -#endif /* __SETUP_H */ +#endif /* __SRC_CURL_SETUP_H */