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 97d5d34d0ccb3db5f345443aa005084ea34c77dd..3de043b94857257bf8d7f8332dc49e8fbdc4cc77 100644 (file)
--- 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 ebab1367dbbba07f5b4641985e81dc9acef73a86..dfe412b3ba030b7f0a76763714fcbd88d3652704 100644 (file)
--- 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"