Commit d4db35c1 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

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.
parent 94c6a5ee

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -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.)

include/curl/multi.h

+4 −0
Original line number Diff line number Diff line
@@ -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