Günter Knauf and Casey O'Donnell worked out an extra #if condition for the

curl/multi.h header to work better in winsock-using apps.

diff --git a/CHANGES b/CHANGES
index 9f9c47dbea6d41536d01c2361cff8d5af34729b0..ba3ffccedcf33545ddc3575d320e50c2e7d72fef 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,9 @@
                                   Changelog
 
 Daniel (30 September 2004)
+- Günter Knauf and Casey O'Donnell worked out an extra #if condition for the
+  curl/multi.h header to work better in winsock-using apps.
+
 - Jean-Philippe Barrette-LaPierre made buildconf run better on Mac OS X by
   properly using glibtoolize instead of plain libtoolize. (This is made if
   glibtool was found and used instead of plain libtool.)

diff --git a/include/curl/multi.h b/include/curl/multi.h
index 37cf6b25aafea8c7fe599d027c4e90bb14920ea7..da9df2e153adbadf3d8bf26acb1f76b83e884687 100644 (file)
--- a/include/curl/multi.h
+++ b/include/curl/multi.h
@@ -52,7 +52,11 @@
 #endif
 
 #if defined(WIN32) && !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