diff options
| author |  Yuri Kunde Schlesner | 2015-05-07 15:06:27 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner | 2015-05-07 15:06:27 -0700 |
| commit | 52654842a0fa9b4e17d5f3ed283d6a16f1f8ca2b (patch) | |
| tree | 352d4e078789f31408c8f8658ba84cc03c08cbcf /src/common/memory_util.cpp | |
| parent | Merge pull request #721 from yuriks/more-cleanups (diff) | |
| parent | Common: Add proper macros to test for architecture pointer size (diff) | |
| download | yuzu-52654842a0fa9b4e17d5f3ed283d6a16f1f8ca2b.tar.gz yuzu-52654842a0fa9b4e17d5f3ed283d6a16f1f8ca2b.tar.xz yuzu-52654842a0fa9b4e17d5f3ed283d6a16f1f8ca2b.zip | |
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) | |||
| 71 | } | 71 | } |
| 72 | #endif | 72 | #endif |
| 73 | 73 | ||
| 74 | #if defined(_M_X64) | 74 | #if EMU_ARCH_BITS == 64 |
| 75 | if ((u64)ptr >= 0x80000000 && low == true) | 75 | if ((u64)ptr >= 0x80000000 && low == true) |
| 76 | LOG_ERROR(Common_Memory, "Executable memory ended up above 2GB!"); | 76 | LOG_ERROR(Common_Memory, "Executable memory ended up above 2GB!"); |
| 77 | #endif | 77 | #endif |