generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prevent definition of HAVE_WINxxx_H symbols and avoid inclusion of Windows headers when compiled with Cygwin in POSIX emulation mode.

Browse Source
This commit is contained in:
Yang Tse
2006-07-05 23:10:37 +00:00
parent c6ae0ebcbf
commit bc2f0c7dcb
9 changed files with 208 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/curl/multi.h
View File

@@ -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 */