From 5a6c89661a96fa2139fa0cff07de2f2eff369127 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Tue, 12 Sep 2006 01:17:16 +0000 Subject: Cygwin preprocessor adjustments --- tests/server/resolve.c | 2 +- tests/server/sockfilt.c | 2 +- tests/server/sws.c | 2 +- tests/server/tftpd.c | 2 +- tests/server/util.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/server') diff --git a/tests/server/resolve.c b/tests/server/resolve.c index 26486f2c5..98a3f4e08 100644 --- a/tests/server/resolve.c +++ b/tests/server/resolve.c @@ -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 diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c index 2e12a03d7..165ecf27a 100644 --- a/tests/server/sockfilt.c +++ b/tests/server/sockfilt.c @@ -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 diff --git a/tests/server/sws.c b/tests/server/sws.c index 525163f58..c2c681dfe 100644 --- a/tests/server/sws.c +++ b/tests/server/sws.c @@ -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 diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c index 2cb45b923..5c3caf4f8 100644 --- a/tests/server/tftpd.c +++ b/tests/server/tftpd.c @@ -458,7 +458,7 @@ int main(int argc, char **argv) } } -#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) +#if defined(WIN32) && !defined(__CYGWIN__) win32_init(); atexit(win32_cleanup); #endif diff --git a/tests/server/util.c b/tests/server/util.c index 7cecfe744..c8faebbb5 100644 --- a/tests/server/util.c +++ b/tests/server/util.c @@ -61,7 +61,7 @@ */ int ourerrno(void) { -#ifdef WIN32 +#if defined(WIN32) && !defined(__CYGWIN__) return (int)GetLastError(); #else return errno; -- cgit v1.2.3