From a8c1a2f488a69fb5b390d2dee9b94d5ba53f07db Mon Sep 17 00:00:00 2001 From: Lynix Date: Fri, 26 Jan 2018 20:57:14 +0100 Subject: [PATCH] Network/Win32: Fix a parsing error when compiler doesn't support __has_include --- src/Nazara/Network/Win32/SocketImpl.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/Nazara/Network/Win32/SocketImpl.cpp b/src/Nazara/Network/Win32/SocketImpl.cpp index e7af5ff71..55726a14f 100644 --- a/src/Nazara/Network/Win32/SocketImpl.cpp +++ b/src/Nazara/Network/Win32/SocketImpl.cpp @@ -8,8 +8,15 @@ #include #include -// Some compilers (olders versions of MinGW) are lacking Mstcpip.h which defines the following struct/#define -#if (defined(__has_include) && !__has_include()) || (defined(NAZARA_COMPILER_MINGW) && !defined(__has_include)) +// Some compilers (olders versions of MinGW) lack Mstcpip.h which defines some structs/defines +#if defined(__has_include) + #define NZ_HAS_MSTCPIP_HEADER __has_include() +#else + // If this version of MinGW doesn't support __has_include, assume it hasn't Mstcpip.h + #define NZ_HAS_MSTCPIP_HEADER !defined(NAZARA_COMPILER_MINGW) +#endif + +#if NZ_HAS_MSTCPIP_HEADER struct tcp_keepalive { u_long onoff;