From 246e0d805ac11aa2a2e14aee485e5deb58653b8b Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 12 Dec 2023 20:38:08 +0000 Subject: [PATCH] tests/server: delete workaround for old-mingw mingw-w64 1.0 comes with w32api v3.12, thus doesn't need this. Follow-up to 38029101e2d78ba125732b3bab6ec267b80a0e72 #11625 Reviewed-by: Jay Satiro Closes #12510 --- tests/server/util.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/tests/server/util.c b/tests/server/util.c index 5cfdab269f..34bca8659d 100644 --- a/tests/server/util.c +++ b/tests/server/util.c @@ -39,9 +39,6 @@ #elif defined(HAVE_SYS_POLL_H) #include #endif -#ifdef __MINGW32__ -#include -#endif #define ENABLE_CURLX_PRINTF /* make the curlx header define all printf() functions to use the curlx_* @@ -58,15 +55,6 @@ #define EINVAL 22 /* errno.h value */ #endif -/* MinGW with w32api version < 3.6 declared in6addr_any as extern, - but lacked the definition */ -#if defined(ENABLE_IPV6) && defined(__MINGW32__) -#if (__W32API_MAJOR_VERSION < 3) || \ - ((__W32API_MAJOR_VERSION == 3) && (__W32API_MINOR_VERSION < 6)) -const struct in6_addr in6addr_any = {{ IN6ADDR_ANY_INIT }}; -#endif /* w32api < 3.6 */ -#endif /* ENABLE_IPV6 && __MINGW32__ */ - static struct timeval tvnow(void); /* This function returns a pointer to STATIC memory. It converts the given -- 2.47.3