From 56bf97ffc9b6e61d3ebf3b5e5a0dfff030b4125e Mon Sep 17 00:00:00 2001 From: Gisle Vanem Date: Wed, 13 Sep 2006 13:41:53 +0000 Subject: 'in6addr_any' must be placed in .c-file. Added 'REAL_WIN32' for all Win32 targets except CygWin. Cleanup. --- tests/server/util.h | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'tests/server/util.h') diff --git a/tests/server/util.h b/tests/server/util.h index de33462cf..30395fc4c 100644 --- a/tests/server/util.h +++ b/tests/server/util.h @@ -40,6 +40,8 @@ extern const char *path; #if defined(WIN32) && !defined(__CYGWIN__) #include +#include +#define REAL_WIN32 #define sleep(sec) Sleep ((sec)*1000) @@ -49,20 +51,15 @@ extern const char *path; #define ENOTSOCK WSAENOTSOCK #define ECONNREFUSED WSAECONNREFUSED -#if defined(ENABLE_IPV6) && defined(__MINGW32__) -const struct in6_addr in6addr_any = {{ IN6ADDR_ANY_INIT }}; -#endif -#endif - -#endif - -#if defined(WIN32) && !defined(__CYGWIN__) #undef perror #define perror(m) win32_perror(m) -#endif +void win32_perror (const char *msg); void win32_init(void); void win32_cleanup(void); +#endif /* WIN32 && !__CYGWIN__ */ /* returns the path name to the test case file */ char *test2file(long testno); + +#endif /* __SERVER_UTIL_H */ -- cgit v1.2.3