refactor: Replace preprocessor condition _WINDOWS with _WIN32 (#1911)

Author: bobtista

Core/GameEngine/Include/GameNetwork/udp.h

@@ -28,7 +28,7 @@
 #include <errno.h>
 #endif
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 #include <winsock.h>
 #include <io.h>
 //#define close _close

Core/GameEngine/Source/GameNetwork/udp.cpp

@@ -154,7 +154,7 @@ Int UDP::Bind(UnsignedInt IP,UnsignedShort Port)
   addr.sin_port=Port;
   addr.sin_addr.s_addr=IP;
   fd=socket(AF_INET,SOCK_DGRAM,DEFAULT_PROTOCOL);
-  #ifdef _WINDOWS
+  #ifdef _WIN32
   if (fd==SOCKET_ERROR)
     fd=-1;
   #endif
@@ -163,7 +163,7 @@ Int UDP::Bind(UnsignedInt IP,UnsignedShort Port)
 
   retval=bind(fd,(struct sockaddr *)&addr,sizeof(addr));
 
-  #ifdef _WINDOWS
+  #ifdef _WIN32
   if (retval==SOCKET_ERROR)
 	{
     retval=-1;
@@ -201,7 +201,7 @@ Int UDP::getLocalAddr(UnsignedInt &ip, UnsignedShort &port)
 // private function
 Int UDP::SetBlocking(Int block)
 {
-  #ifdef _WINDOWS
+  #ifdef _WIN32
    unsigned long flag=1;
    if (block)
      flag=0;
@@ -244,7 +244,7 @@ Int UDP::Write(const unsigned char *msg,UnsignedInt len,UnsignedInt IP,UnsignedS
 
   ClearStatus();
   retval=sendto(fd,(const char *)msg,len,0,(struct sockaddr *)&to,sizeof(to));
-  #ifdef _WINDOWS
+  #ifdef _WIN32
   if (retval==SOCKET_ERROR)
 	{
     retval=-1;
@@ -267,7 +267,7 @@ Int UDP::Read(unsigned char *msg,UnsignedInt len,sockaddr_in *from)
   if (from!=NULL)
   {
     retval=recvfrom(fd,(char *)msg,len,0,(struct sockaddr *)from,&alen);
-    #ifdef _WINDOWS
+    #ifdef _WIN32
     if (retval == SOCKET_ERROR)
 		{
 			if (WSAGetLastError() != WSAEWOULDBLOCK)
@@ -288,7 +288,7 @@ Int UDP::Read(unsigned char *msg,UnsignedInt len,sockaddr_in *from)
   else
   {
     retval=recvfrom(fd,(char *)msg,len,0,NULL,NULL);
-    #ifdef _WINDOWS
+    #ifdef _WIN32
     if (retval==SOCKET_ERROR)
 		{
 			if (WSAGetLastError() != WSAEWOULDBLOCK)
@@ -312,7 +312,7 @@ Int UDP::Read(unsigned char *msg,UnsignedInt len,sockaddr_in *from)
 
 void UDP::ClearStatus(void)
 {
-  #ifndef _WINDOWS
+  #ifndef _WIN32
   errno=0;
   #endif
 
@@ -322,7 +322,7 @@ void UDP::ClearStatus(void)
 UDP::sockStat UDP::GetStatus(void)
 {
 	Int status = m_lastError;
- #ifdef _WINDOWS
+ #ifdef _WIN32
   //int status=WSAGetLastError();
   switch (status) {
     case NO_ERROR:

Core/Libraries/Source/WWVegas/WWLib/ini.cpp

@@ -2285,7 +2285,7 @@ void INIClass::DuplicateCRCError(const char *message, const char *section, const
 	assert(0);
 
 #ifdef RTS_RELEASE
-#ifdef _WINDOWS
+#ifdef _WIN32
 	MessageBox(0, buffer, "Duplicate CRC in INI file.", MB_ICONSTOP | MB_OK);
 #endif
 #endif

Core/Tools/WW3D/pluglib/win.h

@@ -65,7 +65,7 @@
 #pragma warning(pop)
 #endif
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 extern HINSTANCE	ProgramInstance;
 extern HWND			MainWindow;
 extern bool GameInFocus;
@@ -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

Core/Tools/mangler/crc.cpp

@@ -18,7 +18,7 @@
 
 
 #include <signal.h>
-#ifdef _WINDOWS
+#ifdef _WIN32
 #include <process.h> // *MUST* be included before ANY Wnet/Wlib headers if _REENTRANT is defined
 #endif
 

Core/Tools/mangler/mangler.cpp

@@ -20,7 +20,7 @@
 #include <Utility/iostream_adapter.h>
 
 #include <signal.h>
-#ifdef _WINDOWS
+#ifdef _WIN32
 #include <process.h> // *MUST* be included before ANY Wnet/Wlib headers if _REENTRANT is defined
 #endif
 
@@ -97,7 +97,7 @@ int main(int argc, char **argv)
 
 
 	// ----- Initialize Winsock -----
-#ifdef _WINDOWS
+#ifdef _WIN32
 	WORD verReq = MAKEWORD(2, 2);
 	WSADATA wsadata;
 

Core/Tools/mangler/manglertest.cpp

@@ -20,7 +20,7 @@
 #include <Utility/iostream_adapter.h>
 
 #include <signal.h>
-#ifdef _WINDOWS
+#ifdef _WIN32
 #include <process.h> // *MUST* be included before ANY Wnet/Wlib headers if _REENTRANT is defined
 #endif
 
@@ -128,7 +128,7 @@ int main(int argc, char **argv)
 
 
 	// ----- Initialize Winsock -----
-#ifdef _WINDOWS
+#ifdef _WIN32
 	WORD verReq = MAKEWORD(2, 2);
 	WSADATA wsadata;
 

Core/Tools/mangler/wlib/sem4.cpp

@@ -31,7 +31,7 @@ This is useful because the constructor will automatically call sem_init
 
 Sem4::Sem4()
 {
-#ifndef _WINDOWS
+#ifndef _WIN32
   sem_init(&sem,1,1);
 #else
   sem = CreateSemaphore(NULL, 1, 1, NULL);
@@ -40,7 +40,7 @@ Sem4::Sem4()
 
 Sem4::Sem4(uint32 value)
 {
-#ifndef _WINDOWS
+#ifndef _WIN32
   sem_init(&sem,1,value);
 #else
   sem = CreateSemaphore(NULL, value, value, NULL);
@@ -49,7 +49,7 @@ Sem4::Sem4(uint32 value)
 
 Sem4::~Sem4()
 {
-#ifndef _WINDOWS
+#ifndef _WIN32
   sem_destroy(&sem);
 #else
   if (sem) CloseHandle(sem);
@@ -58,7 +58,7 @@ Sem4::~Sem4()
 
 sint32  Sem4::Wait(void) const
 {
-#ifndef _WINDOWS
+#ifndef _WIN32
 	return(sem_wait((sem_t *)&sem));
 #else
 	if (!sem)
@@ -79,7 +79,7 @@ sint32  Sem4::Wait(void) const
 
 sint32 Sem4::Post(void) const
 {
-#ifndef _WINDOWS
+#ifndef _WIN32
   return(sem_post((sem_t *)&sem));
 #else
   if (!sem)
@@ -92,7 +92,7 @@ sint32 Sem4::Post(void) const
 
 sint32 Sem4::TryWait(void) const
 {
-#ifndef _WINDOWS
+#ifndef _WIN32
   return(sem_trywait((sem_t *)&sem));
 #else
 	if (!sem)
@@ -112,7 +112,7 @@ sint32 Sem4::TryWait(void) const
 
 sint32 Sem4::GetValue(int *sval) const
 {
-#ifndef _WINDOWS
+#ifndef _WIN32
   return(sem_getvalue((sem_t *)&sem,sval));
 #else
 	if (!sem)
@@ -128,7 +128,7 @@ sint32 Sem4::GetValue(int *sval) const
 
 sint32 Sem4::Destroy(void)
 {
-#ifndef _WINDOWS
+#ifndef _WIN32
   return(sem_destroy(&sem));
 #else
   return CloseHandle(sem);

Core/Tools/mangler/wlib/sem4.h

@@ -19,17 +19,17 @@
 #pragma once
 
 #include <limits.h>
-#ifndef _WINDOWS
+#ifndef _WIN32
 #include <unistd.h>
 #endif
 #include "wstypes.h"
 
 #ifdef _REENTRANT
-#ifndef _WINDOWS
+#ifndef _WIN32
 #include <semaphore.h>
 #else
 #include <windows.h>
-#endif // _WINDOWS
+#endif // _WIN32
 #endif // _REENTRANT
 
 // Windows headers have a tendency to redefine IN
@@ -42,7 +42,7 @@ class Sem4
 {
  private:
   #ifdef _REENTRANT
-#ifndef _WINDOWS
+#ifndef _WIN32
   sem_t sem;
 #else
   HANDLE sem;

Core/Tools/mangler/wlib/syslogd.cpp

@@ -20,15 +20,15 @@
 
 SyslogD::SyslogD(char *ident,int logopt,int facility,int _priority)
 {
-#ifndef _WINDOWS
+#ifndef _WIN32
   openlog(ident,logopt,facility);
   priority=_priority;
 #endif
 }
 
 int SyslogD::print(const char *str, int len)
 {
-#ifndef _WINDOWS
+#ifndef _WIN32
   char *temp_str=new char[len+1];
   memset(temp_str,0,len+1);
   strncpy(temp_str,str,len);