diff options
| author | Lioncash <mathew1800@gmail.com> | 2014-07-29 21:20:43 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-07-29 21:20:43 -0400 |
| commit | b03c12764da90fcf1a99a9f4e23e12923aa956b3 (patch) | |
| tree | 76d851407259907e81a37afd265c65665fa98e83 /Source/Core | |
| parent | c0e8d9879ae1fc65f5c53f874b82d540528d1216 (diff) | |
Really get rid of the MSVC 2005 workaround completely
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Common/x64CPUDetect.cpp | 8 | ||||
| -rw-r--r-- | Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp | 8 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/OGL/TextureCache.cpp | 8 |
3 files changed, 0 insertions, 24 deletions
diff --git a/Source/Core/Common/x64CPUDetect.cpp b/Source/Core/Common/x64CPUDetect.cpp index 8340344481..3bdac9b30b 100644 --- a/Source/Core/Common/x64CPUDetect.cpp +++ b/Source/Core/Common/x64CPUDetect.cpp @@ -9,15 +9,7 @@ #include "Common/CPUDetect.h" #ifdef _WIN32 -#define _interlockedbittestandset workaround_ms_header_bug_platform_sdk6_set -#define _interlockedbittestandreset workaround_ms_header_bug_platform_sdk6_reset -#define _interlockedbittestandset64 workaround_ms_header_bug_platform_sdk6_set64 -#define _interlockedbittestandreset64 workaround_ms_header_bug_platform_sdk6_reset64 #include <intrin.h> -#undef _interlockedbittestandset -#undef _interlockedbittestandreset -#undef _interlockedbittestandset64 -#undef _interlockedbittestandreset64 #else //#include <config/i386/cpuid.h> diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp index b81334e189..933d50a608 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp @@ -3,15 +3,7 @@ // Refer to the license.txt file included. #ifdef _WIN32 -#define _interlockedbittestandset workaround_ms_header_bug_platform_sdk6_set -#define _interlockedbittestandreset workaround_ms_header_bug_platform_sdk6_reset -#define _interlockedbittestandset64 workaround_ms_header_bug_platform_sdk6_set64 -#define _interlockedbittestandreset64 workaround_ms_header_bug_platform_sdk6_reset64 #include <intrin.h> -#undef _interlockedbittestandset -#undef _interlockedbittestandreset -#undef _interlockedbittestandset64 -#undef _interlockedbittestandreset64 #endif #include "Common/CPUDetect.h" diff --git a/Source/Core/VideoBackends/OGL/TextureCache.cpp b/Source/Core/VideoBackends/OGL/TextureCache.cpp index 8b38fca25c..145bc0086e 100644 --- a/Source/Core/VideoBackends/OGL/TextureCache.cpp +++ b/Source/Core/VideoBackends/OGL/TextureCache.cpp @@ -7,15 +7,7 @@ #include <vector> #ifdef _WIN32 -#define _interlockedbittestandset workaround_ms_header_bug_platform_sdk6_set -#define _interlockedbittestandreset workaround_ms_header_bug_platform_sdk6_reset -#define _interlockedbittestandset64 workaround_ms_header_bug_platform_sdk6_set64 -#define _interlockedbittestandreset64 workaround_ms_header_bug_platform_sdk6_reset64 #include <intrin.h> -#undef _interlockedbittestandset -#undef _interlockedbittestandreset -#undef _interlockedbittestandset64 -#undef _interlockedbittestandreset64 #endif #include "Common/CommonPaths.h" |