diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-07 18:17:33 -0300 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-07 18:22:36 -0300 |
| commit | fae5933ad614ca8c2559f499ebe16b518594cca3 (patch) | |
| tree | 352d4e078789f31408c8f8658ba84cc03c08cbcf /src/common/memory_util.cpp | |
| parent | 4f4d230dac936f32cceb8be35fe09822d85bb2b6 (diff) | |
Common: Add proper macros to test for architecture pointer size
The old system of just defining macros available in some other platform
was susceptible to silently using the wrong code if you forgot to
include a particular header. This fixes a crash on non-Windows platforms
introduced by e1fbac3ca13d37d2625c11d30cfdece4327b446b.
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 2087a1184c..20b791a101 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 |