diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-07-29 18:23:04 -0700 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-07-29 18:23:04 -0700 |
| commit | 4b66c6c65a279aa19df34b1addebbe197b9adb8d (patch) | |
| tree | 7e0ffab14f6111fe991e46b934b0e31dae64cdd1 /Source/Core/VideoBackends/OGL/TextureCache.cpp | |
| parent | 91647f59449bf364a916644b97ab774c2c177bd2 (diff) | |
| parent | b03c12764da90fcf1a99a9f4e23e12923aa956b3 (diff) | |
Merge pull request #698 from lioncash/missed-workaround
Really get rid of the MSVC 2005 workaround completely
Diffstat (limited to 'Source/Core/VideoBackends/OGL/TextureCache.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/TextureCache.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
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" |