From: Marc Hoersken <info@marc-hoersken.de>
Date: Mon, 14 Mar 2022 23:16:46 +0000 (+0100)
Subject: tests/server/util.h: align WIN32 condition with util.c
X-Git-Tag: curl-7_83_0~110
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=24f0fec405e5d888e414aa7e8a3b5437a5d07016;p=thirdparty%2Fcurl.git

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
---

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 <process.h>
 #include <fcntl.h>
 
@@ -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 */