clean up _WINDOWS comments

bobtista · bobtista · commit 65c9cde956a0 · 2025-11-29T08:44:38.000-05:00
diff --git a/Core/Tools/WW3D/pluglib/win.h b/Core/Tools/WW3D/pluglib/win.h
@@ -80,6 +80,6 @@ void __cdecl Print_Win32Error(unsigned long win32Error);
 
 #endif // RTS_DEBUG
 
-#else // _WINDOWS
+#else // _WIN32
 #include <unistd.h>
-#endif // _WINDOWS
+#endif // _WIN32
diff --git a/Core/Tools/mangler/wlib/sem4.h b/Core/Tools/mangler/wlib/sem4.h
@@ -29,7 +29,7 @@
 #include <semaphore.h>
 #else
 #include <windows.h>
-#endif // _WINDOWS
+#endif // _WIN32
 #endif // _REENTRANT
 
 // Windows headers have a tendency to redefine IN
diff --git a/Core/Tools/mangler/wlib/wdebug.h b/Core/Tools/mangler/wlib/wdebug.h
@@ -239,7 +239,7 @@ extern CritSec DebugLibSemaphore;
   DEBUGUNLOCK; \
 }
 
-#else // _WINDOWS
+#else // _WIN32
 
 // Print a variable
 #define PVAR(v) \
@@ -279,7 +279,7 @@ extern CritSec DebugLibSemaphore;
      "]: " << ##X << endl; X \
   DEBUGUNLOCK; \
 }
-#endif // _WINDOWS
+#endif // _WIN32
 
 #endif  // DEBUG
 
diff --git a/Core/Tools/mangler/wlib/wtime.cpp b/Core/Tools/mangler/wlib/wtime.cpp
@@ -54,7 +54,7 @@ static struct tm *localtime_r(const time_t *clockval, struct tm *res) {
 #endif
 	return res;
 }
-#endif // _WINDOWS
+#endif // _WIN32
 
 Wtime::Wtime(void)
 {
diff --git a/Core/Tools/matchbot/wlib/sem4.h b/Core/Tools/matchbot/wlib/sem4.h
@@ -29,7 +29,7 @@
 #include <semaphore.h>
 #else
 #include <windows.h>
-#endif // _WINDOWS
+#endif // _WIN32
 #endif // _REENTRANT
 
 // Windows headers have a tendency to redefine IN
diff --git a/Core/Tools/matchbot/wlib/wdebug.h b/Core/Tools/matchbot/wlib/wdebug.h
@@ -243,7 +243,7 @@ extern CritSec DebugLibSemaphore;
   DEBUGUNLOCK; \
 }
 
-#else // _WINDOWS
+#else // _WIN32
 
 // Print a variable
 #define PVAR(v) \
@@ -283,7 +283,7 @@ extern CritSec DebugLibSemaphore;
      "]: " << ##X << endl; X \
   DEBUGUNLOCK; \
 }
-#endif // _WINDOWS
+#endif // _WIN32
 
 #endif  // DEBUG
 
diff --git a/Core/Tools/matchbot/wlib/wtime.cpp b/Core/Tools/matchbot/wlib/wtime.cpp
@@ -54,7 +54,7 @@ static struct tm *localtime_r(const time_t *clockval, struct tm *res) {
 #endif
 	return res;
 }
-#endif // _WINDOWS
+#endif // _WIN32
 
 Wtime::Wtime(void)
 {

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ extern CritSec DebugLibSemaphore;`
`239`	`239`	`DEBUGUNLOCK; \`
`240`	`240`	`}`
`241`	`241`
`242`		`-#else // _WINDOWS`
	`242`	`+#else // _WIN32`
`243`	`243`
`244`	`244`	`// Print a variable`
`245`	`245`	`#define PVAR(v) \`
`@@ -279,7 +279,7 @@ extern CritSec DebugLibSemaphore;`
`279`	`279`	`"]: " << ##X << endl; X \`
`280`	`280`	`DEBUGUNLOCK; \`
`281`	`281`	`}`
`282`		`-#endif // _WINDOWS`
	`282`	`+#endif // _WIN32`
`283`	`283`
`284`	`284`	`#endif // DEBUG`
`285`	`285`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ static struct tm localtime_r(const time_t clockval, struct tm *res) {`
`54`	`54`	`#endif`
`55`	`55`	`return res;`
`56`	`56`	`}`
`57`		`-#endif // _WINDOWS`
	`57`	`+#endif // _WIN32`
`58`	`58`
`59`	`59`	`Wtime::Wtime(void)`
`60`	`60`	`{`
Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ extern CritSec DebugLibSemaphore;`
`243`	`243`	`DEBUGUNLOCK; \`
`244`	`244`	`}`
`245`	`245`
`246`		`-#else // _WINDOWS`
	`246`	`+#else // _WIN32`
`247`	`247`
`248`	`248`	`// Print a variable`
`249`	`249`	`#define PVAR(v) \`
`@@ -283,7 +283,7 @@ extern CritSec DebugLibSemaphore;`
`283`	`283`	`"]: " << ##X << endl; X \`
`284`	`284`	`DEBUGUNLOCK; \`
`285`	`285`	`}`
`286`		`-#endif // _WINDOWS`
	`286`	`+#endif // _WIN32`
`287`	`287`
`288`	`288`	`#endif // DEBUG`
`289`	`289`