Simplified #ifdef on WIN32; the statement

" !defined(__GNUC__) || defined(__MINGW32__)" implies
CygWin.
This commit is contained in:
Gisle Vanem 2006-09-03 13:52:07 +00:00
parent 6728bda5c5
commit 4f4277d9c7
9 changed files with 11 additions and 11 deletions

View File

@ -38,7 +38,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#endif #endif
#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) #if defined(WIN32) && !defined(__CYGWIN__)
#include <time.h> #include <time.h>
#include <io.h> #include <io.h>
#else #else

View File

@ -40,7 +40,7 @@
#include "strequal.h" #include "strequal.h"
#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) #if defined(WIN32) && !defined(__CYGWIN__)
#include <time.h> #include <time.h>
#include <io.h> #include <io.h>
#else #else

View File

@ -37,7 +37,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#endif #endif
#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) #if defined(WIN32) && !defined(__CYGWIN__)
#include <time.h> #include <time.h>
#include <io.h> #include <io.h>
#include <fcntl.h> #include <fcntl.h>

View File

@ -34,7 +34,7 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) #if defined(WIN32) && !defined(__CYGWIN__)
#else /* probably some kind of unix */ #else /* probably some kind of unix */
#ifdef HAVE_SYS_SOCKET_H #ifdef HAVE_SYS_SOCKET_H

View File

@ -37,7 +37,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#endif #endif
#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) #if defined(WIN32) && !defined(__CYGWIN__)
#include <time.h> #include <time.h>
#include <io.h> #include <io.h>
#else #else

View File

@ -218,7 +218,7 @@ typedef unsigned char bool;
#ifdef WIN32 #ifdef WIN32
#if !defined(__GNUC__) || defined(__MINGW32__) #if !defined(__CYGWIN__)
#define sclose(x) closesocket(x) #define sclose(x) closesocket(x)
#undef HAVE_ALARM #undef HAVE_ALARM

View File

@ -30,7 +30,7 @@
#include "setup.h" #include "setup.h"
#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) #if defined(WIN32) && !defined(__CYGWIN__)
#include <time.h> #include <time.h>
#else #else
#ifdef HAVE_SYS_TIME_H #ifdef HAVE_SYS_TIME_H

View File

@ -41,7 +41,7 @@
#include "strtoofft.h" #include "strtoofft.h"
#include "strequal.h" #include "strequal.h"
#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) #if defined(WIN32) && !defined(__CYGWIN__)
#include <time.h> #include <time.h>
#include <io.h> #include <io.h>
#else #else

View File

@ -38,7 +38,7 @@
#endif #endif
#include <errno.h> #include <errno.h>
#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) #if defined(WIN32) && !defined(__CYGWIN__)
#include <time.h> #include <time.h>
#include <io.h> #include <io.h>
#else #else
@ -78,8 +78,8 @@
#ifndef HAVE_SOCKET #ifndef HAVE_SOCKET
#error "We can't compile without socket() support!" #error "We can't compile without socket() support!"
#endif #endif
#endif #endif
#ifdef USE_LIBIDN #ifdef USE_LIBIDN
#include <idna.h> #include <idna.h>
#include <tld.h> #include <tld.h>
@ -95,7 +95,7 @@ void idn_free (void *ptr); /* prototype from idn-free.h, not provided by
instead */ instead */
#define idn_free(x) (free)(x) #define idn_free(x) (free)(x)
#endif #endif
#endif #endif /* USE_LIBIDN */
#include "urldata.h" #include "urldata.h"
#include "netrc.h" #include "netrc.h"