From ee713df069920ba7feeb15d57eae2029a7e50302 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Wed, 26 Feb 2025 16:53:32 +0100
Subject: [PATCH] server: drop perror redefine (win32)

---
 tests/server/util.c | 12 ++++++------
 tests/server/util.h |  5 -----
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/tests/server/util.c b/tests/server/util.c
index 923e19e573..1e2d024521 100644
--- a/tests/server/util.c
+++ b/tests/server/util.c
@@ -145,7 +145,7 @@ void logmsg(const char *msg, ...)
 
 #ifdef _WIN32
 /* use instead of perror() on generic Windows */
-void win32_perror(const char *msg)
+static void win32_perror(const char *msg)
 {
   char buf[512];
   int err = SOCKERRNO;
@@ -176,7 +176,7 @@ int win32_init(void)
   err = WSAStartup(wVersionRequested, &wsaData);
 
   if(err) {
-    perror("Winsock init failed");
+    win32_perror("Winsock init failed");
     logmsg("Error initialising Winsock -- aborting");
     return 1;
   }
@@ -184,7 +184,7 @@ int win32_init(void)
   if(LOBYTE(wsaData.wVersion) != LOBYTE(wVersionRequested) ||
      HIBYTE(wsaData.wVersion) != HIBYTE(wVersionRequested) ) {
     WSACleanup();
-    perror("Winsock init failed");
+    win32_perror("Winsock init failed");
     logmsg("No suitable winsock.dll found -- aborting");
     return 1;
   }
@@ -635,7 +635,7 @@ static unsigned int WINAPI main_window_loop(void *lpParameter)
   wc.hInstance = (HINSTANCE)lpParameter;
   wc.lpszClassName = TEXT("MainWClass");
   if(!RegisterClass(&wc)) {
-    perror("RegisterClass failed");
+    win32_perror("RegisterClass failed");
     return (DWORD)-1;
   }
 
@@ -647,14 +647,14 @@ static unsigned int WINAPI main_window_loop(void *lpParameter)
                                       (HWND)NULL, (HMENU)NULL,
                                       wc.hInstance, (LPVOID)NULL);
   if(!hidden_main_window) {
-    perror("CreateWindowEx failed");
+    win32_perror("CreateWindowEx failed");
     return (DWORD)-1;
   }
 
   do {
     ret = GetMessage(&msg, NULL, 0, 0);
     if(ret == -1) {
-      perror("GetMessage failed");
+      win32_perror("GetMessage failed");
       return (DWORD)-1;
     }
     else if(ret) {
diff --git a/tests/server/util.h b/tests/server/util.h
index eb598bda77..3e5278d068 100644
--- a/tests/server/util.h
+++ b/tests/server/util.h
@@ -54,11 +54,6 @@ extern const char *cmdfile;
 #ifdef _WIN32
 #include <process.h>
 #include <fcntl.h>
-
-#undef perror
-#define perror(m) win32_perror(m)
-void win32_perror(const char *msg);
-
 int win32_init(void);
 const char *sstrerror(int err);
 #else   /* _WIN32 */