From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 30 Sep 2004 19:50:36 +0000 (+0000)
Subject: Günter Knauf and Casey O'Donnell worked out an extra #if condition for the
X-Git-Tag: upstream/7.37.1~12086
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d4db35c1252a4986247c5ac6c1dbcffa38f8d356;p=platform%2Fupstream%2Fcurl.git

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 9f9c47d..ba3ffcc 100644
--- 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 37cf6b2..da9df2e 100644
--- 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