Undo previous change. This header file belongs to the public

interface and the change could break the compilation of thrid
party apps which link against this library.

diff --git a/ares/ares.h b/ares/ares.h
index 695f8aafbcc43815aa61cda7523e62882e5c38c0..7f76112f7141bff9ebac0fa2a3b71f59fc31dd63 100644 (file)
--- a/ares/ares.h
+++ b/ares/ares.h
@@ -31,7 +31,10 @@
   #include <netinet/in.h>
   #include <sys/socket.h>
   #include <tcp.h>
-#elif !defined(WIN32)
+#elif defined(WIN32)
+  #include <winsock2.h>
+  #include <windows.h>
+#else
   #include <netinet/in.h>
   #include <sys/socket.h>
 #endif

diff --git a/ares/nameser.h b/ares/nameser.h
index 0ccbfd1c0327396cac00cef561fcfeef509f59a1..7127c26402a40a0bce9bfe7c9b24d6cf320d34f4 100644 (file)
--- a/ares/nameser.h
+++ b/ares/nameser.h
@@ -7,6 +7,7 @@
    port build */
 
 #ifndef NETWARE
+#include <windows.h>
 #include <process.h> /* for the _getpid() proto */
 #endif  /* !NETWARE */
 #include <sys/types.h>

diff --git a/include/curl/multi.h b/include/curl/multi.h
index 35cf348852b9140ed8248ff8ecf42a07651e2fda..96c2763eff807643e4d9c033839a17a5b93739d0 100644 (file)
--- a/include/curl/multi.h
+++ b/include/curl/multi.h
@@ -45,7 +45,11 @@
 
 #if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__GNUC__) || \
   defined(__MINGW32__)
-
+#if !(defined(_WINSOCKAPI_) || defined(_WINSOCK_H))
+/* The check above prevents the winsock2 inclusion if winsock.h already was
+   included, since they can't co-exist without problems */
+#include <winsock2.h>
+#endif
 #else
 
 /* HP-UX systems version 9, 10 and 11 lack sys/select.h and so does oldish