diff options
| author | comex <comexk@gmail.com> | 2013-09-24 01:30:41 -0400 |
|---|---|---|
| committer | comex <comexk@gmail.com> | 2013-09-24 01:30:41 -0400 |
| commit | 4cdce55615f5863d1df2fef9169fa2b8ff25cb47 (patch) | |
| tree | 690a0ad59be7ca59ebd9df0520c0bd64434996be /Source/Core/Common/Src/x64CPUDetect.cpp | |
| parent | a7f2160a0f8654b4f6e928a4335a86ff945db1e4 (diff) | |
Don't define _M_IX86 on ARM(!).
Also define _M_* in a common location, and clean up code that these
changes break (including DSPJit files that assume X86 yet are compiled
on ARM for some reason...)
Diffstat (limited to 'Source/Core/Common/Src/x64CPUDetect.cpp')
| -rw-r--r-- | Source/Core/Common/Src/x64CPUDetect.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/Core/Common/Src/x64CPUDetect.cpp b/Source/Core/Common/Src/x64CPUDetect.cpp index e4eac54ef1..3db6227ca7 100644 --- a/Source/Core/Common/Src/x64CPUDetect.cpp +++ b/Source/Core/Common/Src/x64CPUDetect.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include <memory.h> +#include "Common.h" #ifdef _WIN32 #define _interlockedbittestandset workaround_ms_header_bug_platform_sdk6_set |