From 56bf97ffc9b6e61d3ebf3b5e5a0dfff030b4125e Mon Sep 17 00:00:00 2001
From: Gisle Vanem <gvanem@broadpark.no>
Date: Wed, 13 Sep 2006 13:41:53 +0000
Subject: [PATCH] 'in6addr_any' must be placed in .c-file. Added 'REAL_WIN32'
for all Win32 targets except CygWin. Cleanup.
---
tests/server/util.c | 11 ++++++-----
tests/server/util.h | 15 ++++++---------
2 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/tests/server/util.c b/tests/server/util.c
index c8faebbb5d..724cb85174 100644
--- a/tests/server/util.c
+++ b/tests/server/util.c
@@ -55,6 +55,10 @@
#include "getpart.h"
#include "util.h"
+#if defined(ENABLE_IPV6) && defined(__MINGW32__)
+const struct in6_addr in6addr_any = {{ IN6ADDR_ANY_INIT }};
+#endif
+
/*
* ourerrno() returns the errno (or equivalent) on this platform to
* hide platform specific for the function that calls this.
@@ -97,7 +101,7 @@ void logmsg(const char *msg, ...)
}
}
-#if defined(WIN32) && !defined(__CYGWIN__)
+#if defined(REAL_WIN32)
/* use instead of perror() on generic windows */
void win32_perror (const char *msg)
{
@@ -111,9 +115,7 @@ void win32_perror (const char *msg)
fprintf(stderr, "%s: ", msg);
fprintf(stderr, "%s\n", buf);
}
-#endif
-#if defined(WIN32) && !defined(__CYGWIN__)
void win32_init(void)
{
WORD wVersionRequested;
@@ -143,7 +145,7 @@ void win32_cleanup(void)
{
WSACleanup();
}
-#endif
+#endif /* REAL_WIN32 */
/* set by the main code to point to where the test dir is */
const char *path=".";
@@ -154,4 +156,3 @@ char *test2file(long testno)
snprintf(filename, sizeof(filename), TEST_DATA_PATH, path, testno);
return filename;
}
-
diff --git a/tests/server/util.h b/tests/server/util.h
index de33462cfb..30395fc4cc 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 <process.h>
+#include <fcntl.h>
+#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 */
--
GitLab