Remove old non-compliant win32 defines.

common/CMakeLists.txt

@@ -1,5 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-
+CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
 SET(common_sources
 	base_packet.cpp
 	classes.cpp

common/StackWalker/StackWalker.cpp

@@ -23,7 +23,7 @@
  *  2005-08-05   v5    - Removed most Lint (http://www.gimpel.com/) errors... thanks to Okko Willeboordse!
  *
  **********************************************************************/
-#ifdef _WINDOWS
+#ifdef _WIN32
 #include <windows.h>
 #include <tchar.h>
 #include <stdio.h>

common/StackWalker/StackWalker.h

@@ -9,7 +9,7 @@
  * 2013-01-26          - Modified by KimLS(KLS) for EQEmu's purposes
  *
  **********************************************************************/
-#ifdef _WINDOWS
+#ifdef _WIN32
 // #pragma once is supported starting with _MCS_VER 1000, 
 // so we need not to check the version (because we only support _MSC_VER >= 1100)!
 #pragma once

common/base_packet.h

@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 	#include <time.h>
 	#include <winsock2.h>
 	#include <windows.h>

common/condition.cpp

@@ -18,7 +18,7 @@
 
 #include "condition.h"
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 
 	Condition::Condition()
 	{

common/condition.h

@@ -20,7 +20,7 @@
 
 #include "global_define.h"
 #include "mutex.h"
-#ifndef WIN32
+#ifndef _WIN32
 #include <pthread.h>
 #endif
 
@@ -30,7 +30,7 @@
 
 class Condition {
 	private:
-#ifdef WIN32
+#ifdef _WIN32
 		enum {
 			SignalEvent = 0,
 			BroadcastEvent,

common/crash.cpp

@@ -2,7 +2,7 @@
 #include "eqemu_logsys.h"
 #include "crash.h"
 
-#if defined(_WINDOWS) && defined(CRASH_LOGGING)
+#if defined(_WIN32) && defined(CRASH_LOGGING)
 #include "StackWalker.h"
 
 class EQEmuStackWalker : public StackWalker

common/database.cpp

@@ -30,7 +30,7 @@
 #include <string.h>
 
 // Disgrace: for windows compile
-#ifdef _WINDOWS
+#ifdef _WIN32
 #include <windows.h>
 #define snprintf	_snprintf
 #define strncasecmp	_strnicmp

common/database.h

@@ -82,17 +82,7 @@ struct VarCache_Struct {
 };
 
 class PTimerList;
-
-#ifdef _WINDOWS
-#if _MSC_VER > 1700 // greater than 2012 (2013+)
 #	define _ISNAN_(a) std::isnan(a)
-#else
-#	include <float.h>
-#	define _ISNAN_(a) _isnan(a)
-#endif
-#else
-#	define _ISNAN_(a) std::isnan(a)
-#endif
 
 class Database : public DBcore {
 public:

common/database_conversions.cpp

@@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include <iostream>
 
 // Disgrace: for windows compile
-#ifdef _WINDOWS
+#ifdef _WIN32
 #include <windows.h>
 #define snprintf	_snprintf
 #define strncasecmp	_strnicmp

common/database_instances.cpp

@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include <iostream>
 
 // Disgrace: for windows compile
-#ifdef _WINDOWS
+#ifdef _WIN32
 #include <windows.h>
 #define snprintf	_snprintf
 #define strncasecmp	_strnicmp

common/dbcore.cpp

@@ -1,4 +1,4 @@
-#ifdef _WINDOWS
+#ifdef _WIN32
 #include <winsock2.h>
 #endif
 
@@ -13,7 +13,7 @@
 #include <mysqld_error.h>
 #include <string.h>
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 	#define snprintf	_snprintf
 	#define strncasecmp	_strnicmp
 	#define strcasecmp	_stricmp

common/dbcore.h

@@ -1,7 +1,7 @@
 #ifndef DBCORE_H
 #define DBCORE_H
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 	#include <winsock2.h>
 	#include <windows.h>
 #endif

common/eqemu_config.cpp

@@ -152,7 +152,7 @@ void EQEmuConfig::parse_config()
 	TerminateWait    = atoi(_root["server"]["launcher"]["timers"].get("reterminate", "10000").asString().c_str());
 	InitialBootWait  = atoi(_root["server"]["launcher"]["timers"].get("initial", "20000").asString().c_str());
 	ZoneBootInterval = atoi(_root["server"]["launcher"]["timers"].get("interval", "2000").asString().c_str());
-#ifdef WIN32
+#ifdef _WIN32
 	ZoneExe = _root["server"]["launcher"].get("exe", "zone.exe").asString();
 #else
 	ZoneExe = _root["server"]["launcher"].get("exe", "./zone").asString();

common/eqemu_logsys.cpp

@@ -33,7 +33,7 @@
 
 std::ofstream process_log;
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 #include <direct.h>
 #include <conio.h>
 #include <iostream>
@@ -331,7 +331,7 @@ uint16 EQEmuLogSys::GetGMSayColorFromCategory(uint16 log_category)
  */
 void EQEmuLogSys::ProcessConsoleMessage(uint16 debug_level, uint16 log_category, const std::string &message)
 {
-#ifdef _WINDOWS
+#ifdef _WIN32
 	HANDLE  console_handle;
 	console_handle = GetStdHandle(STD_OUTPUT_HANDLE);
 	CONSOLE_FONT_INFOEX info = { 0 };
@@ -413,7 +413,7 @@ void EQEmuLogSys::SetCurrentTimeStamp(char *time_stamp)
  */
 void EQEmuLogSys::MakeDirectory(const std::string &directory_name)
 {
-#ifdef _WINDOWS
+#ifdef _WIN32
 	struct _stat st;
 	if (_stat(directory_name.c_str(), &st) == 0) // exists
 		return;

common/global_define.h

@@ -17,7 +17,7 @@
 */
 
 // WHY IS THIS UP HERE
-#if defined(_DEBUG) && defined(WIN32)
+#if defined(_DEBUG) && defined(_WIN32)
 	#ifndef _CRTDBG_MAP_ALLOC
 		#include <stdlib.h>
 		#include <crtdbg.h>
@@ -27,7 +27,7 @@
 #ifndef EQDEBUG_H
 #define EQDEBUG_H
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 	#include <winsock2.h>
 	#include <windows.h>
 #endif

common/guilds.cpp

@@ -23,6 +23,6 @@
 #include "eq_packet_structs.h"
 
 
-#ifndef WIN32
+#ifndef _WIN32
 #include <netinet/in.h>	//for htonl
-#endif
+#endif

common/ipc_mutex.cpp

@@ -17,7 +17,7 @@
 */
 
 #include "ipc_mutex.h"
-#ifdef _WINDOWS
+#ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 #undef WIN32_LEAN_AND_MEAN
@@ -33,7 +33,7 @@
 
 namespace EQEmu {
 	struct IPCMutex::Implementation {
-#ifdef _WINDOWS
+#ifdef _WIN32
 		HANDLE mut_;
 #else
 		int fd_;
@@ -42,7 +42,7 @@ namespace EQEmu {
 
 	IPCMutex::IPCMutex(std::string name) : locked_(false) {
 		imp_ = new Implementation;
-#ifdef _WINDOWS
+#ifdef _WIN32
 		auto Config = EQEmuConfig::get();
 		std::string final_name = Config->SharedMemDir + "EQEmuMutex_";
 		final_name += name;
@@ -82,7 +82,7 @@ namespace EQEmu {
 	}
 
 	IPCMutex::~IPCMutex() {
-#ifdef _WINDOWS
+#ifdef _WIN32
 		if(locked_) {
 			ReleaseMutex(imp_->mut_);
 		}
@@ -103,7 +103,7 @@ namespace EQEmu {
 			return false;
 		}
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 		DWORD wait_result = WaitForSingleObject(imp_->mut_, INFINITE);
 		if(wait_result != WAIT_OBJECT_0) {
 			return false;
@@ -121,7 +121,7 @@ namespace EQEmu {
 		if(!locked_) {
 			return false;
 		}
-#ifdef _WINDOWS
+#ifdef _WIN32
 		if(!ReleaseMutex(imp_->mut_)) {
 			return false;
 		}

common/memory_mapped_file.cpp

@@ -17,7 +17,7 @@
 */
 
 #include "memory_mapped_file.h"
-#ifdef _WINDOWS
+#ifdef _WIN32
 #include <windows.h>
 #else
 #include <sys/types.h>
@@ -36,7 +36,7 @@
 namespace EQEmu {
 
 	struct MemoryMappedFile::Implementation {
-#ifdef _WINDOWS
+#ifdef _WIN32
 		HANDLE mapped_object_;
 #else
 		int fd_;
@@ -47,7 +47,7 @@ namespace EQEmu {
 		: filename_(filename), size_(size) {
 		imp_ = new Implementation;
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 		DWORD total_size = size + sizeof(shared_memory_struct);
 		HANDLE file = CreateFile(filename.c_str(),
 			GENERIC_READ | GENERIC_WRITE,
@@ -116,7 +116,7 @@ namespace EQEmu {
 		size_ = size;
 		fclose(f);
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 		DWORD total_size = size + sizeof(shared_memory_struct);
 		HANDLE file = CreateFile(filename.c_str(),
 			GENERIC_READ | GENERIC_WRITE,
@@ -172,7 +172,7 @@ namespace EQEmu {
 	}
 
 	MemoryMappedFile::~MemoryMappedFile() {
-#ifdef _WINDOWS
+#ifdef _WIN32
 		if(imp_->mapped_object_) {
 			CloseHandle(imp_->mapped_object_);
 		}

common/misc.cpp

@@ -1,4 +1,4 @@
-#ifdef _WINDOWS
+#ifdef _WIN32
 	// VS6 doesn't like the length of STL generated names: disabling
 	#pragma warning(disable:4786)
 #endif
@@ -10,7 +10,7 @@
 #include <iostream>
 #include <zlib.h>
 
-#ifndef WIN32
+#ifndef _WIN32
 #include <sys/time.h>
 #endif
 
@@ -24,7 +24,7 @@
 
 std::map<int,std::string> DBFieldNames;
 
-#ifndef WIN32
+#ifndef _WIN32
 #if defined(FREEBSD) || defined(__CYGWIN__)
 int print_stacktrace()
 {
@@ -526,7 +526,7 @@ std::string generate_key(int length)
 {
 std::string key;
 //TODO: write this for win32...
-#ifndef WIN32
+#ifndef _WIN32
 int i;
 timeval now;
 	static const char *chars="ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";

common/misc.h

@@ -24,7 +24,7 @@ void decode(char *in, char *out);
 void encode_chunk(char *in, int len, char *out);
 void decode_chunk(char *in, char *out);
 
-#ifndef WIN32
+#ifndef _WIN32
 int print_stacktrace();
 #endif
 

common/misc_functions.cpp

@@ -22,19 +22,19 @@
 #include <string.h>
 #include <time.h>
 
-#ifndef WIN32
+#ifndef _WIN32
 #include <netinet/in.h>
 #include <sys/socket.h>
 #endif
 #include <iostream>
 #include <iomanip>
-#ifdef _WINDOWS
+#ifdef _WIN32
 	#include <io.h>
 #endif
 #include "../common/timer.h"
 #include "../common/seperator.h"
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 	#include <windows.h>
 
 	#define snprintf	_snprintf
@@ -73,7 +73,7 @@ void CoutTimestamp(bool ms) {
 
 
 int32 filesize(FILE* fp) {
-#ifdef _WINDOWS
+#ifdef _WIN32
 	return _filelength(_fileno(fp));
 #else
 	struct stat file_stat;
@@ -88,7 +88,7 @@ int32 filesize(FILE* fp) {
 }
 
 uint32 ResolveIP(const char* hostname, char* errbuf) {
-#ifdef _WINDOWS
+#ifdef _WIN32
 	static InitWinsock ws;
 #endif
 	if (errbuf)
@@ -99,14 +99,14 @@ uint32 ResolveIP(const char* hostname, char* errbuf) {
 		return 0;
 	}
 	struct sockaddr_in	server_sin;
-#ifdef _WINDOWS
+#ifdef _WIN32
 	PHOSTENT phostent = nullptr;
 #else
 	struct hostent *phostent = nullptr;
 #endif
 	server_sin.sin_family = AF_INET;
 	if ((phostent = gethostbyname(hostname)) == nullptr) {
-#ifdef _WINDOWS
+#ifdef _WIN32
 		if (errbuf)
 			snprintf(errbuf, ERRBUF_SIZE, "Unable to get the host name. Error: %i", WSAGetLastError());
 #else
@@ -115,7 +115,7 @@ uint32 ResolveIP(const char* hostname, char* errbuf) {
 #endif
 		return 0;
 	}
-#ifdef _WINDOWS
+#ifdef _WIN32
 	memcpy ((char FAR *)&(server_sin.sin_addr), phostent->h_addr, phostent->h_length);
 #else
 	memcpy ((char*)&(server_sin.sin_addr), phostent->h_addr, phostent->h_length);
@@ -136,7 +136,7 @@ bool ParseAddress(const char* iAddress, uint32* oIP, uint16* oPort, char* errbuf
 	return false;
 }
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 InitWinsock::InitWinsock() {
 	WORD version = MAKEWORD (1,1);
 	WSADATA wsadata;
@@ -157,7 +157,7 @@ const char * itoa(int num) {
 		return temp;
 }
 
-#ifndef WIN32
+#ifndef _WIN32
 const char * itoa(int num, char* a,int b) {
 		static char temp[_ITOA_BUFLEN];
 		memset(temp,0,_ITOA_BUFLEN);

common/misc_functions.h

@@ -77,7 +77,7 @@ uint32 Catch22(uint32 mask);
 
 #define _ITOA_BUFLEN	25
 const char *itoa(int num);	//not thread safe
-#ifndef _WINDOWS
+#ifndef _WIN32
 const char *itoa(int num, char* a,int b);
 #endif
 

common/mutex.cpp

@@ -25,7 +25,7 @@
 
 #endif
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 bool IsTryLockSupported();
 bool TrylockSupported = IsTryLockSupported();
 
@@ -69,7 +69,7 @@ Mutex::Mutex() {
 #if DEBUG_MUTEX_CLASS >= 7
 	std::cout << "Constructing Mutex" << std::endl;
 #endif
-#ifdef _WINDOWS
+#ifdef _WIN32
     InitializeCriticalSection(&CSMutex);
 #else
     pthread_mutexattr_t attr;
@@ -85,7 +85,7 @@ Mutex::Mutex() {
 }
 
 Mutex::~Mutex() {
-#ifdef _WINDOWS
+#ifdef _WIN32
 	DeleteCriticalSection(&CSMutex);
 #else
 #endif
@@ -95,14 +95,14 @@ void Mutex::lock() {
 #if DEBUG_MUTEX_CLASS >= 5
 	if (!trylock()) {
 		std::cout << "Locking Mutex: Having to wait" << std::endl;
-		#ifdef _WINDOWS
+		#ifdef _WIN32
 			EnterCriticalSection(&CSMutex);
 		#else
 			pthread_mutex_lock(&CSMutex);
 		#endif
 	}
 #else
-	#ifdef _WINDOWS
+	#ifdef _WIN32
 		EnterCriticalSection(&CSMutex);
 	#else
 		pthread_mutex_lock(&CSMutex);
@@ -111,7 +111,7 @@ void Mutex::lock() {
 }
 
 bool Mutex::trylock() {
-#ifdef _WINDOWS
+#ifdef _WIN32
 	#if(_WIN32_WINNT >= 0x0400)
 		if (TrylockSupported)
 			return TryEnterCriticalSection(&CSMutex);
@@ -129,7 +129,7 @@ bool Mutex::trylock() {
 }
 
 void Mutex::unlock() {
-#ifdef _WINDOWS
+#ifdef _WIN32
 	LeaveCriticalSection(&CSMutex);
 #else
 	pthread_mutex_unlock(&CSMutex);

common/mutex.h

@@ -17,7 +17,7 @@
 */
 #ifndef MYMUTEX_H
 #define MYMUTEX_H
-#ifdef _WINDOWS
+#ifdef _WIN32
 	#include <winsock2.h>
 	#include <windows.h>
 #else
@@ -36,7 +36,7 @@ public:
 	bool trylock();
 protected:
 private:
-#if defined WIN32 || defined WIN64
+#if defined _WIN32
 	CRITICAL_SECTION CSMutex;
 #else
 	pthread_mutex_t CSMutex;

common/mysql_request_result.h

@@ -1,7 +1,7 @@
 #ifndef MYSQL_REQUEST_RESULT_H
 #define MYSQL_REQUEST_RESULT_H
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 	#include <winsock2.h>
 	#include <windows.h>
 #endif

common/mysql_request_row.h

@@ -1,7 +1,7 @@
 #ifndef MYSQL_REQUEST_ROW_H
 #define MYSQL_REQUEST_ROW_H
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 	#include <winsock2.h>
 	#include <windows.h>
 #endif

common/packet_dump_file.cpp

@@ -29,7 +29,7 @@
 //#endif
 #include <string.h>
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 	#define snprintf	_snprintf
 	#define strncasecmp	_strnicmp
 	#define strcasecmp	_stricmp

common/packet_functions.cpp

@@ -23,7 +23,7 @@
 #include "packet_dump.h"
 #include "packet_functions.h"
 
-#ifndef WIN32
+#ifndef _WIN32
 	#include <netinet/in.h>
 #endif
 

common/proc_launcher.cpp

@@ -22,7 +22,7 @@
 #include "global_define.h"
 #include "types.h"
 #include "proc_launcher.h"
-#ifdef _WINDOWS
+#ifdef _WIN32
 	#include <windows.h>
 #else
 	#include <sys/types.h>
@@ -39,7 +39,7 @@
 
 ProcLauncher ProcLauncher::s_launcher;
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 const ProcLauncher::ProcRef ProcLauncher::ProcError = 0xFFFFFFFF;
 #else
 const ProcLauncher::ProcRef ProcLauncher::ProcError = -1;
@@ -47,7 +47,7 @@ const ProcLauncher::ProcRef ProcLauncher::ProcError = -1;
 
 ProcLauncher::ProcLauncher()
 {
-#ifndef WIN32
+#ifndef _WIN32
 	if(signal(SIGCHLD, ProcLauncher::HandleSigChild) == SIG_ERR)
 		fprintf(stderr, "Unable to register child signal handler. Thats bad.");
 	m_signalCount = 0;
@@ -55,7 +55,7 @@ ProcLauncher::ProcLauncher()
 }
 
 void ProcLauncher::Process() {
-#ifdef _WINDOWS
+#ifdef _WIN32
 	std::map<ProcRef, Spec *>::iterator cur, end, tmp;
 	cur = m_running.begin();
 	end = m_running.end();
@@ -112,7 +112,7 @@ void ProcLauncher::ProcessTerminated(std::map<ProcRef, Spec *>::iterator &it) {
 	if(it->second->handler != nullptr)
 		it->second->handler->OnTerminate(it->first, it->second);
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 	CloseHandle(it->second->proc_info.hProcess);
 #else	//!WIN32
 #endif	//!WIN32
@@ -125,7 +125,7 @@ ProcLauncher::ProcRef ProcLauncher::Launch(Spec *&to_launch) {
 	Spec *it = to_launch;
 	to_launch = nullptr;
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 	STARTUPINFO siStartInfo;
 	BOOL bFuncRetn = FALSE;
 
@@ -283,7 +283,7 @@ bool ProcLauncher::Terminate(const ProcRef &proc, bool graceful) {
 	//we do not remove it from the list until we have been notified
 	//that they have been terminated.
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 	if(!TerminateProcess(res->second->proc_info.hProcess, 0)) {
 		return(false);
 	}
@@ -325,7 +325,7 @@ void ProcLauncher::TerminateAll(bool final) {
 }
 
 
-#ifndef WIN32
+#ifndef _WIN32
 void ProcLauncher::HandleSigChild(int signum) {
 	if(signum == SIGCHLD) {
 		ProcLauncher::get()->m_signalCount++;

common/proc_launcher.h

@@ -33,7 +33,7 @@ public:
 	static ProcLauncher *get() { return(&s_launcher); }
 	static void ProcessInThisThread();
 
-#ifdef WIN32
+#ifdef _WIN32
 	typedef DWORD ProcRef;
 	static const ProcRef ProcError;
 #else
@@ -55,7 +55,7 @@ public:
 		std::string logFile;	//empty = do not redirect output.
 	protected:
 		//None of these fields get copied around
-#ifdef WIN32
+#ifdef _WIN32
 		PROCESS_INFORMATION proc_info;
 #endif
 	};
@@ -83,7 +83,7 @@ protected:
 
 private:
 	static ProcLauncher s_launcher;
-#ifndef WIN32
+#ifndef _WIN32
 	uint32 m_signalCount;
 	static void HandleSigChild(int signum);
 #endif

common/ptimer.cpp

@@ -23,7 +23,7 @@
 #include "database.h"
 #include "string_util.h"
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 	#include <winsock2.h>
 	#include <windows.h>
 	int gettimeofday (timeval *tp, ...);

common/rulesys.h

@@ -121,11 +121,8 @@ private:
 
 	int	m_activeRuleset;
 	std::string m_activeName;
-#ifdef WIN64
-	uint32	m_RuleIntValues [_IntRuleCount ];
-#else
-	int m_RuleIntValues [_IntRuleCount ];
-#endif
+
+	int32 m_RuleIntValues [_IntRuleCount ];
 	float	m_RuleRealValues[_RealRuleCount];
 	uint32	m_RuleBoolValues[_BoolRuleCount];
 

common/serverinfo.cpp

@@ -21,7 +21,7 @@
 // Implement preliminary support for *nix variants
 // misanthropicfiend
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 #include <windows.h>
 
 char Ver_name[100];

common/serverinfo.h

@@ -18,7 +18,7 @@
 #ifndef SERVERINFO_H
 #define SERVERINFO_H
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 	extern char Ver_name[36];
 	extern DWORD Ver_build, Ver_min, Ver_maj, Ver_pid;
 	int GetOS();

common/spdat.cpp

@@ -77,7 +77,7 @@
 #include "classes.h"
 #include "spdat.h"
 
-#ifndef WIN32
+#ifndef _WIN32
 #include <stdlib.h>
 #include "unix.h"
 #endif

common/string_util.cpp

@@ -17,7 +17,7 @@
 #include "string_util.h"
 #include <algorithm>
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 	#include <windows.h>
 
 	#define snprintf	_snprintf

common/timer.cpp

@@ -18,7 +18,7 @@
 
 
 // Disgrace: for windows compile
-#ifndef WIN32
+#ifndef _WIN32
 	#include <sys/time.h>
 #else
 	#include <sys/timeb.h>
@@ -64,7 +64,7 @@ Timer::Timer(uint32 start, uint32 timer, bool iUseAcurateTiming = false) {
 }
 
 /* Reimplemented for MSVC - Bounce */
-#ifdef _WINDOWS
+#ifdef _WIN32
 int gettimeofday (timeval *tp, ...)
 {
 	timeb tb;

common/timer.h

@@ -22,7 +22,7 @@
 #include <chrono>
 
 // Disgrace: for windows compile
-#ifdef _WINDOWS
+#ifdef _WIN32
 	#include "global_define.h"
 	int gettimeofday (timeval *tp, ...);
 #endif

common/types.h

@@ -29,7 +29,7 @@ typedef int16_t int16;
 typedef int32_t int32;
 typedef int64_t int64;
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 	#pragma warning( disable : 4200 )
 #endif
 
@@ -42,7 +42,7 @@ typedef unsigned short		ushort;
 typedef unsigned char		uchar;
 typedef const char Const_char;	//for perl XS
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 	#if (!defined(_MSC_VER) || (defined(_MSC_VER) && _MSC_VER < 1900))
 		#define snprintf	_snprintf
 	#endif
@@ -61,7 +61,7 @@ typedef const char Const_char;	//for perl XS
 #define H32(i)	((uint32) (i >> 32))
 #define L16(i)	((uint16) i)
 
-#ifndef WIN32
+#ifndef _WIN32
 // More WIN32 compatability
 	typedef unsigned long DWORD;
 	typedef unsigned char BYTE;
@@ -79,14 +79,14 @@ typedef const char Const_char;	//for perl XS
 #endif
 
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 #define DLLFUNC extern "C" __declspec(dllexport)
 #else
 #define DLLFUNC extern "C"
 #endif
 
 // htonll and ntohll already defined on windows
-#ifndef WIN32
+#ifndef _WIN32
 #	if defined(__linux__)
 #		include <endian.h>
 #	elif defined(__FreeBSD__) || defined(__NetBSD__)

common/unix.cpp

@@ -15,7 +15,7 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#ifndef _WINDOWS
+#ifndef _WIN32
 
 #include "unix.h"
 #include <string.h>

common/unix.h

@@ -15,7 +15,7 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#ifndef _WINDOWS
+#ifndef _WIN32
 #ifndef __UNIX_H__
 #define __UNIX_H__
 #include <unistd.h>

common/useperl.h

@@ -10,16 +10,16 @@
 // this doesn't do shit for C++ but libc++ and GCC 6.1+ use it to define some macros
 #include <ciso646>
 
-#ifndef WIN32
+#ifndef _WIN32
 extern "C" {	//the perl headers dont do this for us...
 #endif
 #include <perl.h>
 #include <XSUB.h>
-#ifndef WIN32
+#ifndef _WIN32
 };
 #endif
 
-#ifdef WIN32
+#ifdef _WIN32
 #ifndef snprintf
 #define snprintf _snprintf
 #endif

common/version.h

@@ -40,7 +40,7 @@
 #endif
 #define COMPILE_DATE	__DATE__
 #define COMPILE_TIME	__TIME__
-#ifndef WIN32
+#ifndef _WIN32
 	#define LAST_MODIFIED	__TIME__
 #else
 	#define LAST_MODIFIED	__TIMESTAMP__