diff options
| author | Gisle Vanem <gvanem@broadpark.no> | 2006-09-03 13:52:07 +0000 |
|---|---|---|
| committer | Gisle Vanem <gvanem@broadpark.no> | 2006-09-03 13:52:07 +0000 |
| commit | 4f4277d9c73b876d0054474d1f696a555c5c9966 (patch) | |
| tree | 3342f1b5da6eaa1369b20261fad18c8204d40669 /lib | |
| parent | 6728bda5c5b68e3ba62ac68706376ab63e45e8b4 (diff) | |
Simplified #ifdef on WIN32; the statement
" !defined(__GNUC__) || defined(__MINGW32__)" implies
CygWin.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/dict.c | 2 | ||||
| -rw-r--r-- | lib/easy.c | 2 | ||||
| -rw-r--r-- | lib/file.c | 2 | ||||
| -rw-r--r-- | lib/ftp.c | 2 | ||||
| -rw-r--r-- | lib/http.c | 2 | ||||
| -rw-r--r-- | lib/setup.h | 2 | ||||
| -rw-r--r-- | lib/timeval.h | 2 | ||||
| -rw-r--r-- | lib/transfer.c | 2 | ||||
| -rw-r--r-- | lib/url.c | 6 |
9 files changed, 11 insertions, 11 deletions
diff --git a/lib/dict.c b/lib/dict.c index 1f130ad15..c83301c30 100644 --- a/lib/dict.c +++ b/lib/dict.c @@ -38,7 +38,7 @@ #include <sys/stat.h> #endif -#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) +#if defined(WIN32) && !defined(__CYGWIN__) #include <time.h> #include <io.h> #else diff --git a/lib/easy.c b/lib/easy.c index 3356ca3cf..141c74779 100644 --- a/lib/easy.c +++ b/lib/easy.c @@ -40,7 +40,7 @@ #include "strequal.h" -#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) +#if defined(WIN32) && !defined(__CYGWIN__) #include <time.h> #include <io.h> #else diff --git a/lib/file.c b/lib/file.c index 4fb5b1f5f..6643e8015 100644 --- a/lib/file.c +++ b/lib/file.c @@ -37,7 +37,7 @@ #include <sys/stat.h> #endif -#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) +#if defined(WIN32) && !defined(__CYGWIN__) #include <time.h> #include <io.h> #include <fcntl.h> @@ -34,7 +34,7 @@ #include <unistd.h> #endif -#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) +#if defined(WIN32) && !defined(__CYGWIN__) #else /* probably some kind of unix */ #ifdef HAVE_SYS_SOCKET_H diff --git a/lib/http.c b/lib/http.c index 1b638829b..f7d495529 100644 --- a/lib/http.c +++ b/lib/http.c @@ -37,7 +37,7 @@ #include <sys/stat.h> #endif -#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) +#if defined(WIN32) && !defined(__CYGWIN__) #include <time.h> #include <io.h> #else diff --git a/lib/setup.h b/lib/setup.h index b06214dfb..a02834ecd 100644 --- a/lib/setup.h +++ b/lib/setup.h @@ -218,7 +218,7 @@ typedef unsigned char bool; #ifdef WIN32 -#if !defined(__GNUC__) || defined(__MINGW32__) +#if !defined(__CYGWIN__) #define sclose(x) closesocket(x) #undef HAVE_ALARM diff --git a/lib/timeval.h b/lib/timeval.h index 84ea27418..f79f41c73 100644 --- a/lib/timeval.h +++ b/lib/timeval.h @@ -30,7 +30,7 @@ #include "setup.h" -#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) +#if defined(WIN32) && !defined(__CYGWIN__) #include <time.h> #else #ifdef HAVE_SYS_TIME_H diff --git a/lib/transfer.c b/lib/transfer.c index 4fab23c73..824b6a6e8 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -41,7 +41,7 @@ #include "strtoofft.h" #include "strequal.h" -#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) +#if defined(WIN32) && !defined(__CYGWIN__) #include <time.h> #include <io.h> #else @@ -38,7 +38,7 @@ #endif #include <errno.h> -#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) +#if defined(WIN32) && !defined(__CYGWIN__) #include <time.h> #include <io.h> #else @@ -78,8 +78,8 @@ #ifndef HAVE_SOCKET #error "We can't compile without socket() support!" #endif - #endif + #ifdef USE_LIBIDN #include <idna.h> #include <tld.h> @@ -95,7 +95,7 @@ void idn_free (void *ptr); /* prototype from idn-free.h, not provided by instead */ #define idn_free(x) (free)(x) #endif -#endif +#endif /* USE_LIBIDN */ #include "urldata.h" #include "netrc.h" |