From c540d7244531d501f16b485a3e45e358f98853be Mon Sep 17 00:00:00 2001 From: glx Date: Sun, 9 Dec 2018 02:28:14 +0100 Subject: Fix: [Win32] WIN32 may not be defined, always prefer the compiler predefined macro _WIN32 --- src/network/core/os_abstraction.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/network/core/os_abstraction.h') diff --git a/src/network/core/os_abstraction.h b/src/network/core/os_abstraction.h index c24cc9f8f..c320cd910 100644 --- a/src/network/core/os_abstraction.h +++ b/src/network/core/os_abstraction.h @@ -21,7 +21,7 @@ #ifdef ENABLE_NETWORK /* Windows stuff */ -#if defined(WIN32) || defined(WIN64) +#if defined(_WIN32) #include #include #include @@ -125,7 +125,7 @@ static inline void OTTDfreeaddrinfo(struct addrinfo *ai) } #define freeaddrinfo OTTDfreeaddrinfo #endif /* __MINGW32__ && __CYGWIN__ */ -#endif /* WIN32 */ +#endif /* _WIN32 */ /* UNIX stuff */ #if defined(UNIX) && !defined(__OS2__) @@ -290,7 +290,7 @@ typedef unsigned long in_addr_t; */ static inline bool SetNonBlocking(SOCKET d) { -#ifdef WIN32 +#ifdef _WIN32 u_long nonblocking = 1; #else int nonblocking = 1; -- cgit v1.2.3-70-g09d2