diff options
| author | Yang Tse <yangsita@gmail.com> | 2006-10-11 16:01:16 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2006-10-11 16:01:16 +0000 |
| commit | e150150d9f1e0578c85af05de15ab6336066cec1 (patch) | |
| tree | 7ccad4887ea68afc2ce0503b4fa7a913fdd40d60 /lib | |
| parent | 943f0733bb187dfacdfdc23806ab030cee97c9fc (diff) | |
Remove redundant __CYGWIN__ symbol check
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/strerror.c | 6 | ||||
| -rw-r--r-- | lib/timeval.h | 2 | ||||
| -rw-r--r-- | lib/transfer.c | 2 | ||||
| -rw-r--r-- | lib/url.c | 11 |
9 files changed, 16 insertions, 15 deletions
diff --git a/lib/dict.c b/lib/dict.c index b14426a28..d6443f4b9 100644 --- a/lib/dict.c +++ b/lib/dict.c @@ -38,7 +38,7 @@ #include <sys/stat.h> #endif -#if defined(WIN32) && !defined(__CYGWIN__) +#ifdef WIN32 #include <time.h> #include <io.h> #else diff --git a/lib/easy.c b/lib/easy.c index cd931b82c..a400f84f1 100644 --- a/lib/easy.c +++ b/lib/easy.c @@ -40,7 +40,7 @@ #include "strequal.h" -#if defined(WIN32) && !defined(__CYGWIN__) +#ifdef WIN32 #include <time.h> #include <io.h> #else diff --git a/lib/file.c b/lib/file.c index 1d4356b8f..e9ed5b7f0 100644 --- a/lib/file.c +++ b/lib/file.c @@ -37,7 +37,7 @@ #include <sys/stat.h> #endif -#if defined(WIN32) && !defined(__CYGWIN__) +#ifdef WIN32 #include <time.h> #include <io.h> #include <fcntl.h> @@ -34,7 +34,7 @@ #include <unistd.h> #endif -#if defined(WIN32) && !defined(__CYGWIN__) +#ifdef WIN32 #else /* probably some kind of unix */ #ifdef HAVE_SYS_SOCKET_H diff --git a/lib/http.c b/lib/http.c index 809f20ca9..596a380d7 100644 --- a/lib/http.c +++ b/lib/http.c @@ -37,7 +37,7 @@ #include <sys/stat.h> #endif -#if defined(WIN32) && !defined(__CYGWIN__) +#ifdef WIN32 #include <time.h> #include <io.h> #else diff --git a/lib/strerror.c b/lib/strerror.c index 0309e4ff7..5b01a2297 100644 --- a/lib/strerror.c +++ b/lib/strerror.c @@ -382,7 +382,7 @@ curl_share_strerror(CURLSHcode error) #endif } -#if defined(WIN32) && !defined(__CYGWIN__) +#ifdef WIN32 /* This function handles most / all (?) Winsock errors cURL is able to produce. */ @@ -570,7 +570,7 @@ get_winsock_error (int err, char *buf, size_t len) buf [len-1] = '\0'; return buf; } -#endif /* WIN32 && !__CYGWIN__ */ +#endif /* WIN32 */ /* * Our thread-safe and smart strerror() replacement. @@ -595,7 +595,7 @@ const char *Curl_strerror(struct connectdata *conn, int err) max = sizeof(conn->syserr_buf)-1; *buf = '\0'; -#if defined(WIN32) && !defined(__CYGWIN__) +#ifdef WIN32 #ifdef _WIN32_WCE buf[0]=0; diff --git a/lib/timeval.h b/lib/timeval.h index f79f41c73..8ab7a4401 100644 --- a/lib/timeval.h +++ b/lib/timeval.h @@ -30,7 +30,7 @@ #include "setup.h" -#if defined(WIN32) && !defined(__CYGWIN__) +#ifdef WIN32 #include <time.h> #else #ifdef HAVE_SYS_TIME_H diff --git a/lib/transfer.c b/lib/transfer.c index ded1d5573..6cd071dc1 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -41,7 +41,7 @@ #include "strtoofft.h" #include "strequal.h" -#if defined(WIN32) && !defined(__CYGWIN__) +#ifdef WIN32 #include <time.h> #include <io.h> #else @@ -38,7 +38,7 @@ #endif #include <errno.h> -#if defined(WIN32) && !defined(__CYGWIN__) +#ifdef WIN32 #include <time.h> #include <io.h> #else @@ -165,9 +165,10 @@ static void signalPipeClose(struct curl_llist *pipe); #define MAX_PIPELINE_LENGTH 5 #ifndef USE_ARES -/* not for Win32, unless it is cygwin - not for ares builds */ -#if !defined(WIN32) || defined(__CYGWIN__) +/* not for ares builds */ + +#ifndef WIN32 +/* not for WIN32 builds */ #ifndef RETSIGTYPE #define RETSIGTYPE void @@ -187,8 +188,8 @@ RETSIGTYPE alarmfunc(int sig) #endif return; } -#endif #endif /* SIGALRM */ +#endif /* WIN32 */ #endif /* USE_ARES */ void Curl_safefree(void *ptr) |