diff options
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 |