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 /ares | |
| parent | d6ffb4c177615e766268bd4ab3afc9cef77aa7c9 (diff) | |
'Fix' windows builds
Diffstat (limited to 'ares')
| -rw-r--r-- | ares/config-win32.h | 4 | ||||
| -rw-r--r-- | ares/setup.h | 30 |
2 files changed, 32 insertions, 2 deletions
diff --git a/ares/config-win32.h b/ares/config-win32.h index 5026728b4..4847507f5 100644 --- a/ares/config-win32.h +++ b/ares/config-win32.h @@ -16,6 +16,10 @@ #ifndef __CONFIG_WIN32_H #define __CONFIG_WIN32_H +#define HAVE_WINDOWS_H +#define HAVE_WINSOCK2_H +#define HAVE_WS2TCPIP_H + #if defined(__MINGW32__) #define HAVE_GETOPT_H #endif diff --git a/ares/setup.h b/ares/setup.h index 831bda460..05eb76b3d 100644 --- a/ares/setup.h +++ b/ares/setup.h @@ -22,6 +22,34 @@ #include "config-win32.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 + + /* simple work-around for now, for systems without configure support */ #ifndef __DJGPP__ #define ssize_t int @@ -44,8 +72,6 @@ /* now typedef our socket type */ #if defined(WIN32) && !defined(WATT32) -#include <winsock2.h> -#include <ws2tcpip.h> typedef SOCKET ares_socket_t; #define ARES_SOCKET_BAD INVALID_SOCKET #else |