Merge branch 'unix-fastmem'

dolphin-emu · Jan 16, 2013 · 54974cb · 54974cb
2 parents ddf2309 + eb5e7d4
commit 54974cb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp
@@ -312,7 +312,7 @@ void CpuThread()
 
 	Common::SetCurrentThreadAffinity(1);  // Force to first core
 
-	#if defined(_WIN32) && defined(_M_X64)
+	#if defined(_M_X64)
 		EMM::InstallExceptionHandler(); // Let's run under memory watch
 	#endif
 

diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp
@@ -118,7 +118,7 @@ void EmuCodeBlock::UnsafeLoadToEAX(const Gen::OpArg & opAddress, int accessSize,
 
 void EmuCodeBlock::SafeLoadToEAX(const Gen::OpArg & opAddress, int accessSize, s32 offset, bool signExtend)
 {
-#if defined(_WIN32) && defined(_M_X64)
+#if defined(_M_X64)
 #ifdef ENABLE_MEM_CHECK
 	if (accessSize == 32 && !Core::g_CoreStartupParameter.bMMU && !Core::g_CoreStartupParameter.bEnableDebugging)
 #else