diff options
| author | Yang Tse <yangsita@gmail.com> | 2005-12-19 00:15:04 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2005-12-19 00:15:04 +0000 |
| commit | e6b98d315254788e8fabceba840da3f6dfd6fbd5 (patch) | |
| tree | 03b5d8c5aeb700e7acbdb5914c51b6a05fb23c32 /include | |
| parent | 5fd8dd2dcef3579522f86012305e8e31ea5d1247 (diff) | |
| download | curl-e6b98d315254788e8fabceba840da3f6dfd6fbd5.tar.gz | |
Undo previous change. This header file belongs to the public
interface and the change could break the compilation of thrid
party apps which link against this library.
Diffstat (limited to 'include')
| -rw-r--r-- | include/curl/multi.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/curl/multi.h b/include/curl/multi.h index 35cf34885..96c2763ef 100644 --- a/include/curl/multi.h +++ b/include/curl/multi.h @@ -45,7 +45,11 @@ #if defined(WIN32) && !defined(_WIN32_WCE) && !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 |