diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2015-02-24 01:31:45 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2015-02-24 01:31:45 +0100 |
| commit | b8edd8aedc75ae4e2abd8c5558af94e98c7bebcb (patch) | |
| tree | c6832e8ac25a78ed769b5b76a1d9e19d5b6e2b27 /Source/Core/Common/x64CPUDetect.cpp | |
| parent | 7a61bd5519ccc7a648376f4c6b9a5ab2ca3c75da (diff) | |
| parent | daf4aa09471a0113315fa49aa8409bfc9ba947fd (diff) | |
Merge pull request #2101 from Tilka/intrinsics
Clean up the intrinsics #ifdef mess with a common header
Diffstat (limited to 'Source/Core/Common/x64CPUDetect.cpp')
| -rw-r--r-- | Source/Core/Common/x64CPUDetect.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Source/Core/Common/x64CPUDetect.cpp b/Source/Core/Common/x64CPUDetect.cpp index 8ad8046c8b..d4d3eba05e 100644 --- a/Source/Core/Common/x64CPUDetect.cpp +++ b/Source/Core/Common/x64CPUDetect.cpp @@ -7,13 +7,9 @@ #include "Common/CommonTypes.h" #include "Common/CPUDetect.h" +#include "Common/Intrinsics.h" -#ifdef _WIN32 -#include <intrin.h> -#else - -//#include <config/i386/cpuid.h> -#include <xmmintrin.h> +#ifndef _WIN32 #if defined __FreeBSD__ #include <sys/types.h> |