From d4db35c1252a4986247c5ac6c1dbcffa38f8d356 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 30 Sep 2004 19:50:36 +0000 Subject: =?UTF-8?q?G=FCnter=20Knauf=20and=20Casey=20O'Donnell=20worked=20o?= =?UTF-8?q?ut=20an=20extra=20#if=20condition=20for=20the=20curl/multi.h=20?= =?UTF-8?q?header=20to=20work=20better=20in=20winsock-using=20apps.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES | 3 +++ include/curl/multi.h | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/CHANGES b/CHANGES index 9f9c47dbe..ba3ffcced 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 37cf6b25a..da9df2e15 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 +#endif #else /* HP-UX systems version 9, 10 and 11 lack sys/select.h and so does oldish -- cgit v1.2.3