diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2013-01-15 23:19:03 -0600 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2013-01-15 23:19:03 -0600 |
| commit | 54974cbc8e4b578cfb34f4cbd01a2f6145ef9664 (patch) | |
| tree | cc487b470413b5475ed4df7404c5060161987fa7 /Source/Core | |
| parent | ddf23094c299cb061baaa7a110ecb7413130d094 (diff) | |
| parent | eb5e7d44bd0b7acb43b6837572fa3eb31ef4c1ad (diff) | |
Merge branch 'unix-fastmem'
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Src/Core.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index b1269ab7c7..be75f67550 100644 --- 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 index 333f0cdc05..7f1c9b590c 100644 --- 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 |