From 24f0fec405e5d888e414aa7e8a3b5437a5d07016 Mon Sep 17 00:00:00 2001 From: Marc Hoersken Date: Tue, 15 Mar 2022 00:16:46 +0100 Subject: [PATCH] tests/server/util.h: align WIN32 condition with util.c There is no need to test for both _WIN32 and WIN32 as curl_setup.h automatically defines the later if the first one is defined. Also tests/server/util.c is only checking for WIN32 arouund the implementation of win32_perror, so just defining _WIN32 would not be sufficient for a successful compilation. Reviewed-by: Daniel Stenberg Reviewed-by: Jay Satiro Closes #8594 --- tests/server/util.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/server/util.h b/tests/server/util.h index ae05b59350..f67b685279 100644 --- a/tests/server/util.h +++ b/tests/server/util.h @@ -40,7 +40,7 @@ extern const char *serverlogfile; extern const char *cmdfile; -#if defined(WIN32) || defined(_WIN32) +#ifdef WIN32 #include #include @@ -49,9 +49,7 @@ extern const char *cmdfile; #undef perror #define perror(m) win32_perror(m) void win32_perror(const char *msg); -#endif /* WIN32 or _WIN32 */ -#ifdef WIN32 void win32_init(void); void win32_cleanup(void); #endif /* WIN32 */ -- 2.47.3