From fae5933ad614ca8c2559f499ebe16b518594cca3 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Thu, 7 May 2015 18:17:33 -0300 Subject: 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. --- src/common/memory_util.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/common/memory_util.cpp') diff --git a/src/common/memory_util.cpp b/src/common/memory_util.cpp index 2087a118..20b791a1 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 -- cgit v1.2.3