diff options
| author | Yang Tse <yangsita@gmail.com> | 2011-08-04 20:47:31 +0200 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2011-08-04 20:47:31 +0200 |
| commit | b56bbabee0b49abef4d163b203f6e2e4f6651066 (patch) | |
| tree | 6434ddc48b1a5887f50963ad12e0ba0eb06a4ce7 | |
| parent | a04912bb6576b9295d3f28429044ff797e32ab7c (diff) | |
curl.h: untangle a preprocessor block, removing duplicate sys/types.h inclusion
| -rw-r--r-- | include/curl/curl.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/include/curl/curl.h b/include/curl/curl.h index 0dc934bfb..ab64fe25a 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -55,18 +55,17 @@ #include <sys/types.h> #include <time.h> -#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__GNUC__) && \ - !defined(__CYGWIN__) || defined(__MINGW32__) +#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__CYGWIN__) #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> #include <ws2tcpip.h> #endif -#else +#endif /* HP-UX systems version 9, 10 and 11 lack sys/select.h and so does oldish - libc5-based Linux systems. Only include it on system that are known to + libc5-based Linux systems. Only include it on systems that are known to require it! */ #if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \ defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \ @@ -75,14 +74,13 @@ #include <sys/select.h> #endif -#ifndef _WIN32_WCE +#if !defined(WIN32) && !defined(_WIN32_WCE) #include <sys/socket.h> #endif + #if !defined(WIN32) && !defined(__WATCOMC__) && !defined(__VXWORKS__) #include <sys/time.h> #endif -#include <sys/types.h> -#endif #ifdef __BEOS__ #include <support/SupportDefs.h> |