From e40392ac035d2d545027659d5fca8255e586f8cb Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 4 Mar 2004 15:32:18 +0000 Subject: =?UTF-8?q?Andr=E9s=20Garc=EDa's=20patch=20to=20prevent=20warnings?= =?UTF-8?q?=20while=20compiling=20with=20mingw,=20mainly=20because=20it=20?= =?UTF-8?q?is=20now=20possible=20to=20have=20both=20WIN32=20and=20HAVE=5FC?= =?UTF-8?q?ONFIG=5FH=20defined.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/connect.c | 1 - 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 #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" -- cgit v1.2.3