diff --git a/Common/MemoryUtil.cpp b/Common/MemoryUtil.cpp index 5d854010aa71..3ddb5a123107 100644 --- a/Common/MemoryUtil.cpp +++ b/Common/MemoryUtil.cpp @@ -302,8 +302,8 @@ void ProtectMemoryPages(const void* ptr, size_t size, uint32_t memProtFlags) { if ((memProtFlags & (MEM_PROT_WRITE | MEM_PROT_EXEC)) == (MEM_PROT_WRITE | MEM_PROT_EXEC)) PanicAlert("Bad memory protect : W^X is in effect, can't both write and exec"); } - // Note - both VirtualProtect and mprotect will affect the full pages containing the requested range, - // so no need to round ptr and size down/up. + // Note - both VirtualProtect will affect the full pages containing the requested range. + // mprotect does not seem to, at least not on Android unless I made a mistake somewhere, so we manually round. #ifdef _WIN32 uint32_t protect = ConvertProtFlagsWin32(memProtFlags); DWORD oldValue; diff --git a/ios/main.mm b/ios/main.mm index 44ad25d202cd..ceffaceca85c 100644 --- a/ios/main.mm +++ b/ios/main.mm @@ -4,6 +4,7 @@ #import #import #import +#import #import #import "AppDelegate.h"