Commit 5a6c8966 authored by Yang Tse's avatar Yang Tse
Browse files

Cygwin preprocessor adjustments

parent 7c574572

tests/libtest/first.c

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ int test(char *url); 
int select_test (int num_fds, fd_set *rd, fd_set *wr, fd_set *exc,

                 struct timeval *tv)

{

#ifdef WIN32

#if defined(WIN32) && !defined(__CYGWIN__)

  /* Winsock doesn't like no socket set in 'rd', 'wr' or 'exc'. This is

   * case when 'num_fds <= 0. So sleep.

   */

tests/libtest/lib518.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#define NUM_OPEN (FD_SETSIZE + 10)

#define NUM_NEEDED (NUM_OPEN + 16)



#if defined(WIN32) || defined(_WIN32) || defined(MSDOS)

#if (defined(WIN32) || defined(_WIN32) || defined(MSDOS)) && !defined(__CYGWIN__)

#define DEV_NULL "NUL"

#else

#define DEV_NULL "/dev/null"

tests/server/resolve.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ int main(int argc, char *argv[]) 
    return 0;

  }



#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)

#if defined(WIN32) && !defined(__CYGWIN__)

  win32_init();

  atexit(win32_cleanup);

#endif

tests/server/sockfilt.c

+1 −1
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ int main(int argc, char *argv[]) 
    }

  }



#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)

#if defined(WIN32) && !defined(__CYGWIN__)

  win32_init();

  atexit(win32_cleanup);

#else

tests/server/sws.c

+1 −1
Original line number Diff line number Diff line
@@ -773,7 +773,7 @@ int main(int argc, char *argv[]) 
    }

  }



#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)

#if defined(WIN32) && !defined(__CYGWIN__)

  win32_init();

  atexit(win32_cleanup);

#else