summaryrefslogtreecommitdiff
path: root/Source/Core/Common/MemoryUtil.cpp
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@gmail.com>2014-03-02 05:21:50 -0600
committerRyan Houdek <Sonicadvance1@gmail.com>2014-03-04 09:36:59 -0600
commit4f02132f9323a147c68b7dc1a79a62be33c1f170 (patch)
tree3941a217046e39148768a1c7eb1aff0289251d4b /Source/Core/Common/MemoryUtil.cpp
parentd1ccd964cd7c552068c1ed649235eac83e3b1195 (diff)
Make our architecture defines less stupid.
Our defines were never clear between what meant 64bit or x86_64 This makes a clear cut between bitness and architecture. This commit also has the side effect of bringing up aarch64 compiling support.
Diffstat (limited to 'Source/Core/Common/MemoryUtil.cpp')
-rw-r--r--Source/Core/Common/MemoryUtil.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/Common/MemoryUtil.cpp b/Source/Core/Common/MemoryUtil.cpp
index cfdc3ad730..441ba2f10b 100644
--- a/Source/Core/Common/MemoryUtil.cpp
+++ b/Source/Core/Common/MemoryUtil.cpp
@@ -75,7 +75,7 @@ void* AllocateExecutableMemory(size_t size, bool low)
}
#endif
-#if defined(_M_X64)
+#if _ARCH_64
if ((u64)ptr >= 0x80000000 && low == true)
PanicAlert("Executable memory ended up above 2GB!");
#endif