Really get rid of the MSVC 2005 workaround completely
This commit is contained in:
parent
c0e8d9879a
commit
b03c12764d
|
@ -9,15 +9,7 @@
|
||||||
#include "Common/CPUDetect.h"
|
#include "Common/CPUDetect.h"
|
||||||
|
|
||||||
#ifdef _WIN32
|
#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>
|
#include <intrin.h>
|
||||||
#undef _interlockedbittestandset
|
|
||||||
#undef _interlockedbittestandreset
|
|
||||||
#undef _interlockedbittestandset64
|
|
||||||
#undef _interlockedbittestandreset64
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
//#include <config/i386/cpuid.h>
|
//#include <config/i386/cpuid.h>
|
||||||
|
|
|
@ -3,15 +3,7 @@
|
||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
#ifdef _WIN32
|
#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>
|
#include <intrin.h>
|
||||||
#undef _interlockedbittestandset
|
|
||||||
#undef _interlockedbittestandreset
|
|
||||||
#undef _interlockedbittestandset64
|
|
||||||
#undef _interlockedbittestandreset64
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "Common/CPUDetect.h"
|
#include "Common/CPUDetect.h"
|
||||||
|
|
|
@ -7,15 +7,7 @@
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#ifdef _WIN32
|
#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>
|
#include <intrin.h>
|
||||||
#undef _interlockedbittestandset
|
|
||||||
#undef _interlockedbittestandreset
|
|
||||||
#undef _interlockedbittestandset64
|
|
||||||
#undef _interlockedbittestandreset64
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "Common/CommonPaths.h"
|
#include "Common/CommonPaths.h"
|
||||||
|
|
Loading…
Reference in New Issue