moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-03-11 07:39:50 -04:00
Code Issues Releases Wiki Activity

Gnter Knauf and Casey O'Donnell worked out an extra #if condition for the

Browse Source 
curl/multi.h header to work better in winsock-using apps.
This commit is contained in:
Daniel Stenberg 2004-09-30 19:50:36 +00:00
parent 94c6a5eeab
commit d4db35c125
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -7,6 +7,9 @@
Changelog Changelog
Daniel (30 September 2004) 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 - Jean-Philippe Barrette-LaPierre made buildconf run better on Mac OS X by
properly using glibtoolize instead of plain libtoolize. (This is made if properly using glibtoolize instead of plain libtoolize. (This is made if
glibtool was found and used instead of plain libtool.) glibtool was found and used instead of plain libtool.)

4
include/curl/multi.h
View File

@ -52,7 +52,11 @@
#endif #endif
#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) #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> #include <winsock2.h>
#endif
#else #else
/* HP-UX systems version 9, 10 and 11 lack sys/select.h and so does oldish /* HP-UX systems version 9, 10 and 11 lack sys/select.h and so does oldish