From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 4 Mar 2004 15:32:18 +0000 (+0000)
Subject: Andrés García's patch to prevent warnings while compiling with mingw, mainly
X-Git-Tag: curl-7_11_1~121
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e40392ac035d2d545027659d5fca8255e586f8cb;p=thirdparty%2Fcurl.git

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.
---

diff --git a/lib/connect.c b/lib/connect.c
index 97d5d34d0c..3de043b948 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 ebab1367db..dfe412b3ba 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"