Skip to content

Commit 9ced874

Browse files
committed
use "#ifdef WINDOWS" instead of "#if _WIN32 || _WIN64" for xrCore
1 parent 27b5b46 commit 9ced874

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

src/xrCore/LocatorAPI.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
#pragma once
22

3+
#ifdef WINDOWS
34
#pragma warning(push)
45
#pragma warning(disable : 4995)
5-
6-
#if _WIN32 || _WIN64
76
#include <io.h>
7+
#pragma warning(pop)
88
#endif
99

10-
#pragma warning(pop)
1110
#include "Common/Util.hpp"
1211
#include "LocatorAPI_defs.h"
1312
//#include "xrCore/Threading/Lock.hpp"

src/xrCore/xrCore.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
#endif // frequently in release code due to large amount of VERIFY
4545

4646
// Our headers
47-
#if _WIN32||_WIN64
47+
#ifdef WINDOWS
4848
#include "xrDebug.h"
4949
#endif
5050
//#include "vector.h"

src/xrCore/xrDebug.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include <string>
88

9-
#if _WIN32 || _WIN64
9+
#ifdef WINDOWS
1010
#pragma warning(push)
1111
#pragma warning(disable : 4091) /// 'typedef ': ignored on left of '' when no variable is declared
1212
#include <DbgHelp.h>

0 commit comments

Comments
 (0)