From b0eab6876017599d1fc0cebb649f7d195c04a0dd Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Fri, 3 Mar 2017 14:01:12 +0100 Subject: [PATCH] Fix compiler warning --- Core/MemMap.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Core/MemMap.cpp b/Core/MemMap.cpp index 398cead011..3fbb021cce 100644 --- a/Core/MemMap.cpp +++ b/Core/MemMap.cpp @@ -208,6 +208,7 @@ bool MemoryMap_Setup(u32 flags) { // Grab some pagefile backed memory out of the void ... g_arena.GrabLowMemSpace(total_mem); +#if !PPSSPP_PLATFORM(ANDROID) if (g_arena.NeedsProbing()) { int base_attempts = 0; #if defined(_WIN32) && PPSSPP_ARCH(32BIT) @@ -217,7 +218,7 @@ bool MemoryMap_Setup(u32 flags) { uintptr_t stride = 0x400000; #else // iOS - uintptr_t max_base_addr = 0x1FFFF0000ULL - 0x80000000; + uintptr_t max_base_addr = 0x1FFFF0000ULL - 0x80000000ULL; uintptr_t min_base_addr = 0x100000000ULL; uintptr_t stride = 0x800000; #endif @@ -232,7 +233,10 @@ bool MemoryMap_Setup(u32 flags) { ERROR_LOG(MEMMAP, "MemoryMap_Setup: Failed finding a memory base."); PanicAlert("MemoryMap_Setup: Failed finding a memory base."); return false; - } else { + } + else +#endif + { base = g_arena.Find4GBBase(); }