diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-07 15:06:27 -0700 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-07 15:06:27 -0700 |
commit | 52654842a0fa9b4e17d5f3ed283d6a16f1f8ca2b (patch) | |
tree | 352d4e078789f31408c8f8658ba84cc03c08cbcf /src/common/memory_util.cpp | |
parent | 4f4d230dac936f32cceb8be35fe09822d85bb2b6 (diff) | |
parent | fae5933ad614ca8c2559f499ebe16b518594cca3 (diff) |
Merge pull request #724 from citra-emu/arch-misdetection
Common: Add proper macros to test for architecture pointer size
Diffstat (limited to 'src/common/memory_util.cpp')
-rw-r--r-- | src/common/memory_util.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/memory_util.cpp b/src/common/memory_util.cpp index 2087a1184..20b791a10 100644 --- a/src/common/memory_util.cpp +++ b/src/common/memory_util.cpp @@ -71,7 +71,7 @@ void* AllocateExecutableMemory(size_t size, bool low) } #endif -#if defined(_M_X64) +#if EMU_ARCH_BITS == 64 if ((u64)ptr >= 0x80000000 && low == true) LOG_ERROR(Common_Memory, "Executable memory ended up above 2GB!"); #endif |