diff --git a/Common/MachineContext.h b/Common/MachineContext.h
index f6aa42d7ea..fdd84f26d1 100644
--- a/Common/MachineContext.h
+++ b/Common/MachineContext.h
@@ -64,7 +64,7 @@ typedef CONTEXT SContext;
 
 #endif
 
-#elif PPSSPP_PLATFORM(MACOS)
+#elif PPSSPP_PLATFORM(MAC)
 
 // for modules:
 #define _XOPEN_SOURCE
diff --git a/Core/MemMap.cpp b/Core/MemMap.cpp
index 5eefe1c941..730613d5e9 100644
--- a/Core/MemMap.cpp
+++ b/Core/MemMap.cpp
@@ -479,9 +479,7 @@ void Memset(const u32 _Address, const u8 _iValue, const u32 _iLength) {
 	CBreakPoints::ExecMemCheck(_Address, true, _iLength, currentMIPS->pc);
 }
 
-// We do not support crash catching on UWP and iOS.
-// On iOS, the sigcontext struct seems to be missing??
-#if !PPSSPP_PLATFORM(IOS) && !PPSSPP_PLATFORM(UWP)
+#ifdef MACHINE_CONTEXT_SUPPORTED
 
 bool HandleFault(uintptr_t hostAddress, void *ctx) {
 	SContext *context = (SContext *)ctx;