diff options
| author | Yang Tse <yangsita@gmail.com> | 2005-12-16 20:55:07 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2005-12-16 20:55:07 +0000 |
| commit | e105d5c28f3f6c7034a8da2682bbc662ad6c15e1 (patch) | |
| tree | ace47dc7dd2070e741f26d324cc64dc56c48980e /lib | |
| parent | d6ffb4c177615e766268bd4ab3afc9cef77aa7c9 (diff) | |
'Fix' windows builds
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/config-win32.h | 3 | ||||
| -rw-r--r-- | lib/config-win32ce.h | 3 | ||||
| -rw-r--r-- | lib/setup.h | 42 |
3 files changed, 34 insertions, 14 deletions
diff --git a/lib/config-win32.h b/lib/config-win32.h index 030b82dfc..81216461d 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -205,6 +205,9 @@ /* Define if you have the <time.h> header file. */ #define HAVE_TIME_H 1 +/* Define if you have the <windows.h> header file. */ +#define HAVE_WINDOWS_H 1 + /* Define if you have the <winsock.h> header file. */ #define HAVE_WINSOCK_H 1 diff --git a/lib/config-win32ce.h b/lib/config-win32ce.h index 84c5eb8f6..ffc89d0b2 100644 --- a/lib/config-win32ce.h +++ b/lib/config-win32ce.h @@ -194,6 +194,9 @@ /* Define if you have the <time.h> header file. */ #define HAVE_TIME_H 1 +/* Define if you have the <windows.h> header file. */ +#define HAVE_WINDOWS_H 1 + /* Define if you have the <winsock.h> header file. */ #define HAVE_WINSOCK_H 1 diff --git a/lib/setup.h b/lib/setup.h index 2fcc29cd8..6719aa27d 100644 --- a/lib/setup.h +++ b/lib/setup.h @@ -64,6 +64,34 @@ #include "amigaos.h" #endif + +/* + * Include header files for windows builds before redefining anything. + * Use this preproessor block only to include or exclude windows.h, + * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs + * to any other further and independant block. + */ + +#ifdef WIN32 +# ifdef HAVE_WINDOWS_H +# ifndef WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +# endif +# include <windows.h> +# ifdef HAVE_WINSOCK2_H +# include <winsock2.h> +# ifdef HAVE_WS2TCPIP_H +# include <ws2tcpip.h> +# endif +# else +# ifdef HAVE_WINSOCK_H +# include <winsock.h> +# endif +# endif +# endif +#endif + + #ifndef TRUE #define TRUE 1 #endif @@ -161,20 +189,6 @@ typedef unsigned char bool; #ifdef WIN32 -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN /* Prevent including <winsock*.h> in <windows.h> */ -#endif /* WIN32_LEAN_AND_MEAN */ - -#ifdef HAVE_WINSOCK2_H -#include <winsock2.h> /* required by telnet.c */ -#endif - -#if defined(ENABLE_IPV6) || defined(USE_SSLEAY) -#if !defined(_MSC_VER) || (_MSC_VER >= 1300) -#include <ws2tcpip.h> -#endif -#endif - #if !defined(__GNUC__) || defined(__MINGW32__) #define sclose(x) closesocket(x) |