diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2004-03-04 15:32:18 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2004-03-04 15:32:18 +0000 |
| commit | e40392ac035d2d545027659d5fca8255e586f8cb (patch) | |
| tree | eff776e8689ad32450372cca0e54ecac210484b3 | |
| parent | 1eb9fd6c4d93f7adbca00556575751537b4be47a (diff) | |
Andrés García's patch to prevent warnings while compiling with mingw, mainly
because it is now possible to have both WIN32 and HAVE_CONFIG_H defined.
| -rw-r--r-- | lib/connect.c | 1 | ||||
| -rw-r--r-- | lib/setup.h | 9 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/connect.c b/lib/connect.c index 97d5d34d0..3de043b94 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -68,7 +68,6 @@ #endif #ifdef WIN32 -#define HAVE_IOCTLSOCKET #include <windows.h> #define EINPROGRESS WSAEINPROGRESS #define EWOULDBLOCK WSAEWOULDBLOCK diff --git a/lib/setup.h b/lib/setup.h index ebab1367d..dfe412b3b 100644 --- a/lib/setup.h +++ b/lib/setup.h @@ -39,16 +39,17 @@ #ifdef HAVE_CONFIG_H #include "config.h" /* the configure script results */ +#else +#ifdef WIN32 +/* hand-modified win32 config.h! */ +#include "config-win32.h" +#endif #endif #ifdef VMS /* hand-modified VMS config.h! */ #include "config-vms.h" #endif -#ifdef WIN32 -/* hand-modified win32 config.h! */ -#include "config-win32.h" -#endif #ifdef macintosh /* hand-modified MacOS config.h! */ #include "config-mac.h" |