From 3d7f9877fb9ec1e21d33c580323b55672beb085b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 15 Jun 2021 16:44:24 +0100 Subject: [PATCH] Predefine __USE_W32_SOCKETS for Cygwin in allheaders test This is required to avoid warnings (and worse, probably) due to conflicting function declarations in the platform SDK and Cygwin headers that have started happening since 8dfcb582da (Regenerate configure after enabling IPv6 support by default, 2021-06-15). --- tests/allheaders.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/allheaders.cpp b/tests/allheaders.cpp index 2a78445bb2..1264104bbc 100644 --- a/tests/allheaders.cpp +++ b/tests/allheaders.cpp @@ -36,6 +36,13 @@ // We have to include this one first in order to check for wxUSE_XXX below. #include "wx/setup.h" +// Normally this is done in wx/defs.h, but as we don't include it here, we need +// to do it manually to avoid warnings inside the standard headers included +// from catch.hpp. +#if defined(__CYGWIN__) && defined(__WINDOWS__) + #define __USE_W32_SOCKETS +#endif + #include "catch.hpp" #if defined(__WXQT__)