Merge branch 'master' into jgrpp

# Conflicts:
#	src/debug.cpp

src/network/core/core.cpp

@@ -64,7 +64,7 @@ bool NetworkCoreInitialize()
 #endif /* __MORPHOS__ / __AMIGA__ */
 
 /* Let's load the network in windows */
-#ifdef WIN32
+#ifdef _WIN32
 	{
 		WSADATA wsa;
 		DEBUG(net, 3, "[core] loading windows socket library");
@@ -73,7 +73,7 @@ bool NetworkCoreInitialize()
 			return false;
 		}
 	}
-#endif /* WIN32 */
+#endif /* _WIN32 */
 
 	return true;
 }
@@ -94,7 +94,7 @@ void NetworkCoreShutdown()
 	if (SocketBase != NULL) CloseLibrary(SocketBase);
 #endif
 
-#if defined(WIN32)
+#if defined(_WIN32)
 	WSACleanup();
 #endif
 }

src/network/core/host.cpp

@@ -107,7 +107,7 @@ static void NetworkFindBroadcastIPsInternal(NetworkAddressList *broadcast) // GE
 	freeifaddrs(ifap);
 }
 
-#elif defined(WIN32)
+#elif defined(_WIN32)
 static void NetworkFindBroadcastIPsInternal(NetworkAddressList *broadcast) // Win32 implementation
 {
 	SOCKET sock = socket(AF_INET, SOCK_DGRAM, 0);

src/network/core/os_abstraction.h

@@ -21,7 +21,7 @@
 #ifdef ENABLE_NETWORK
 
 /* Windows stuff */
-#if defined(WIN32) || defined(WIN64)
+#if defined(_WIN32)
 #include <errno.h>
 #include <winsock2.h>
 #include <ws2tcpip.h>
@@ -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;