From 9ced874a1cbb06ebce8b59ec81963fde1eb9efb8 Mon Sep 17 00:00:00 2001 From: Aleksey Komarov Date: Fri, 18 May 2018 05:20:36 +0300 Subject: [PATCH] use "#ifdef WINDOWS" instead of "#if _WIN32 || _WIN64" for xrCore --- src/xrCore/LocatorAPI.h | 5 ++--- src/xrCore/xrCore.h | 2 +- src/xrCore/xrDebug.h | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/xrCore/LocatorAPI.h b/src/xrCore/LocatorAPI.h index 748ed220d71..8109ebdacf7 100644 --- 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 +#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 index 0d0a0a1a5e0..53582b1af5c 100644 --- 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 index 5a8fe7e69f9..ffc6e790779 100644 --- a/src/xrCore/xrDebug.h +++ b/src/xrCore/xrDebug.h @@ -6,7 +6,7 @@ #include -#if _WIN32 || _WIN64 +#ifdef WINDOWS #pragma warning(push) #pragma warning(disable : 4091) /// 'typedef ': ignored on left of '' when no variable is declared #include