diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2004-09-30 19:50:36 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2004-09-30 19:50:36 +0000 |
| commit | d4db35c1252a4986247c5ac6c1dbcffa38f8d356 (patch) | |
| tree | f65dc3d37ca2eba7e53f5cfca2beb603d7fe8bb3 /include | |
| parent | 94c6a5eeabfb73ec8c10bb14ee43dc297dde5470 (diff) | |
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.
Diffstat (limited to 'include')
| -rw-r--r-- | include/curl/multi.h | 4 |
1 files changed, 4 insertions, 0 deletions
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 <winsock2.h> +#endif #else /* HP-UX systems version 9, 10 and 11 lack sys/select.h and so does oldish |