fix(build): detect Windows using _WIN32/WIN32 in addition to _WINDOWS

bobtista · bobtista · commit b7d72383da53 · 2025-11-25T15:34:45.000-05:00
diff --git a/Core/GameEngine/Include/GameNetwork/udp.h b/Core/GameEngine/Include/GameNetwork/udp.h
@@ -28,7 +28,7 @@
 #include <errno.h>
 #endif
 
-#ifdef _WINDOWS
+#if defined(_WINDOWS) || defined(_WIN32) || defined(WIN32)
 #include <winsock.h>
 #include <io.h>
 //#define close _close
diff --git a/Core/GameEngine/Source/GameNetwork/udp.cpp b/Core/GameEngine/Source/GameNetwork/udp.cpp
@@ -201,7 +201,7 @@ Int UDP::getLocalAddr(UnsignedInt &ip, UnsignedShort &port)
 // private function
 Int UDP::SetBlocking(Int block)
 {
-  #ifdef _WINDOWS
+  #if defined(_WINDOWS) || defined(_WIN32) || defined(WIN32)
    unsigned long flag=1;
    if (block)
      flag=0;
diff --git a/Core/Tools/mangler/wnet/tcp.cpp b/Core/Tools/mangler/wnet/tcp.cpp
@@ -99,7 +99,7 @@ while (1)
 #include "tcp.h"
 #include <stdarg.h>
 
-#ifndef _WINDOWS
+#if !defined(_WINDOWS) && !defined(_WIN32) && !defined(WIN32)
 #include <errno.h>
 #define closesocket close
 #endif
@@ -170,7 +170,7 @@ sint32 TCP::SetBlocking(bit8 block,sint32 whichFD)
    if (whichFD==0)
      whichFD=fd;
 
-   #ifdef _WINDOWS
+   #if defined(_WINDOWS) || defined(_WIN32) || defined(WIN32)
    unsigned long flag=1;
    if (block)
      flag=0;
diff --git a/Core/Tools/mangler/wnet/tcp.h b/Core/Tools/mangler/wnet/tcp.h
@@ -30,7 +30,7 @@ TCP                   Neal Kettler        neal@westwood.com
 #include <string.h>
 #include <assert.h>
 
-#ifdef _WINDOWS
+#if defined(_WINDOWS) || defined(_WIN32) || defined(WIN32)
 
 #include <winsock.h>
 #include <io.h>
diff --git a/Core/Tools/mangler/wnet/udp.cpp b/Core/Tools/mangler/wnet/udp.cpp
@@ -104,7 +104,7 @@ bit8 UDP::getLocalAddr(uint32 &ip, uint16 &port)
 // private function
 sint32 UDP::SetBlocking(bit8 block)
 {
-  #ifdef _WINDOWS
+  #if defined(_WINDOWS) || defined(_WIN32) || defined(WIN32)
    unsigned long flag=1;
    if (block)
      flag=0;
diff --git a/Core/Tools/mangler/wnet/udp.h b/Core/Tools/mangler/wnet/udp.h
@@ -24,7 +24,7 @@
 #include <errno.h>
 #include <string.h>
 
-#ifdef _WINDOWS
+#if defined(_WINDOWS) || defined(_WIN32) || defined(WIN32)
 #include <winsock.h>
 #include <io.h>
 #define close _close
diff --git a/Core/Tools/matchbot/wnet/tcp.cpp b/Core/Tools/matchbot/wnet/tcp.cpp
@@ -99,7 +99,7 @@ while (1)
 #include "tcp.h"
 #include <stdarg.h>
 
-#ifndef _WINDOWS
+#if !defined(_WINDOWS) && !defined(_WIN32) && !defined(WIN32)
 #include <errno.h>
 #define closesocket close
 #endif
@@ -170,7 +170,7 @@ sint32 TCP::SetBlocking(bit8 block,sint32 whichFD)
    if (whichFD==0)
      whichFD=fd;
 
-   #ifdef _WINDOWS
+   #if defined(_WINDOWS) || defined(_WIN32) || defined(WIN32)
    unsigned long flag=1;
    if (block)
      flag=0;
diff --git a/Core/Tools/matchbot/wnet/tcp.h b/Core/Tools/matchbot/wnet/tcp.h
@@ -30,7 +30,7 @@ TCP                   Neal Kettler        neal@westwood.com
 #include <string.h>
 #include <assert.h>
 
-#ifdef _WINDOWS
+#if defined(_WINDOWS) || defined(_WIN32) || defined(WIN32)
 
 #include <winsock.h>
 #include <io.h>
diff --git a/Core/Tools/matchbot/wnet/udp.cpp b/Core/Tools/matchbot/wnet/udp.cpp
@@ -104,7 +104,7 @@ bit8 UDP::getLocalAddr(uint32 &ip, uint16 &port)
 // private function
 sint32 UDP::SetBlocking(bit8 block)
 {
-  #ifdef _WINDOWS
+  #if defined(_WINDOWS) || defined(_WIN32) || defined(WIN32)
    unsigned long flag=1;
    if (block)
      flag=0;
diff --git a/Core/Tools/matchbot/wnet/udp.h b/Core/Tools/matchbot/wnet/udp.h
@@ -24,7 +24,7 @@
 #include <errno.h>
 #include <string.h>
 
-#ifdef _WINDOWS
+#if defined(_WINDOWS) || defined(_WIN32) || defined(WIN32)
 #include <winsock.h>
 #include <io.h>
 #define close _close

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ Int UDP::getLocalAddr(UnsignedInt &ip, UnsignedShort &port)`
`201`	`201`	`// private function`
`202`	`202`	`Int UDP::SetBlocking(Int block)`
`203`	`203`	`{`
`204`		`- #ifdef _WINDOWS`
	`204`	`+ #if defined(_WINDOWS) \|\| defined(_WIN32) \|\| defined(WIN32)`
`205`	`205`	`unsigned long flag=1;`
`206`	`206`	`if (block)`
`207`	`207`	`flag=0;`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ bit8 UDP::getLocalAddr(uint32 &ip, uint16 &port)`
`104`	`104`	`// private function`
`105`	`105`	`sint32 UDP::SetBlocking(bit8 block)`
`106`	`106`	`{`
`107`		`- #ifdef _WINDOWS`
	`107`	`+ #if defined(_WINDOWS) \|\| defined(_WIN32) \|\| defined(WIN32)`
`108`	`108`	`unsigned long flag=1;`
`109`	`109`	`if (block)`
`110`	`110`	`flag=0;`