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.

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

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>

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