diff options
| author | Yang Tse <yangsita@gmail.com> | 2006-07-05 23:10:37 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2006-07-05 23:10:37 +0000 |
| commit | bc2f0c7dcbd22ab52971df4a419933e70f263a3f (patch) | |
| tree | f0691aecd2dab76f769aa04ad94c18a8fa4ed6aa /include | |
| parent | c6ae0ebcbf3c7b47ab444195613c6e14843fa248 (diff) | |
Prevent definition of HAVE_WINxxx_H symbols and avoid inclusion of Windows headers when compiled with Cygwin in POSIX emulation mode.
Diffstat (limited to 'include')
| -rw-r--r-- | include/curl/multi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/curl/multi.h b/include/curl/multi.h index 6ce682690..4fc70640a 100644 --- a/include/curl/multi.h +++ b/include/curl/multi.h @@ -43,8 +43,8 @@ #define WIN32 1 #endif -#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__GNUC__) || \ - defined(__MINGW32__) +#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__GNUC__) && \ + !defined(__CYGWIN__) || 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 */ |