use "#ifdef WINDOWS" instead of "#if _WIN32 || _WIN64" for xrCore

OpenXRay · May 18, 2018 · 9ced874 · 9ced874
1 parent 27b5b46
commit 9ced874
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/xrCore/LocatorAPI.h b/src/xrCore/LocatorAPI.h
@@ -1,13 +1,12 @@
 #pragma once
 
+#ifdef WINDOWS
 #pragma warning(push)
 #pragma warning(disable : 4995)
-
-#if _WIN32 || _WIN64
 #include <io.h>
+#pragma warning(pop)
 #endif
 
-#pragma warning(pop)
 #include "Common/Util.hpp"
 #include "LocatorAPI_defs.h"
 //#include "xrCore/Threading/Lock.hpp"

diff --git a/src/xrCore/xrCore.h b/src/xrCore/xrCore.h
@@ -44,7 +44,7 @@
 #endif // frequently in release code due to large amount of VERIFY
 
 // Our headers
-#if _WIN32||_WIN64
+#ifdef WINDOWS
 #include "xrDebug.h"
 #endif
 //#include "vector.h"

diff --git a/src/xrCore/xrDebug.h b/src/xrCore/xrDebug.h
@@ -6,7 +6,7 @@
 
 #include <string>
 
-#if _WIN32 || _WIN64
+#ifdef WINDOWS
 #pragma warning(push)
 #pragma warning(disable : 4091) /// 'typedef ': ignored on left of '' when no variable is declared
 #include <DbgHelp.h>