Clean up the intrinsics #ifdef mess

4 files changed, 6 insertions, 17 deletions

diff --git a/Source/Core/Common/Atomic_Win32.h b/Source/Core/Common/Atomic_Win32.h
index ee763aaea2..17afb8c8cc 100644
--- a/Source/Core/Common/Atomic_Win32.h
+++ b/Source/Core/Common/Atomic_Win32.h
@@ -6,10 +6,10 @@
 
 #pragma once
 
-#include <intrin.h>
 #include <Windows.h>
 
 #include "Common/Common.h"
+#include "Common/Intrinsics.h"
 
 // Atomic operations are performed in a single step by the CPU. It is
 // impossible for other threads to see the operation "half-done."
diff --git a/Source/Core/Common/Hash.cpp b/Source/Core/Common/Hash.cpp
index 63caced040..7efc4549d7 100644
--- a/Source/Core/Common/Hash.cpp
+++ b/Source/Core/Common/Hash.cpp
@@ -4,11 +4,9 @@
 
 #include <algorithm>
 #include "Common/CommonFuncs.h"
-#include "Common/Hash.h"
-#if _M_SSE >= 0x402
 #include "Common/CPUDetect.h"
-#include <nmmintrin.h>
-#endif
+#include "Common/Hash.h"
+#include "Common/Intrinsics.h"
 
 static u64 (*ptrHashFunction)(const u8 *src, u32 len, u32 samples) = &GetMurmurHash3;
 
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>
diff --git a/Source/Core/Common/x64FPURoundMode.cpp b/Source/Core/Common/x64FPURoundMode.cpp
index 90143d7e13..b04579b850 100644
--- a/Source/Core/Common/x64FPURoundMode.cpp
+++ b/Source/Core/Common/x64FPURoundMode.cpp
@@ -7,12 +7,7 @@
 #include "Common/CommonTypes.h"
 #include "Common/CPUDetect.h"
 #include "Common/FPURoundMode.h"
-
-#ifdef _WIN32
-#	include <mmintrin.h>
-#else
-#	include <xmmintrin.h>
-#endif
+#include "Common/Intrinsics.h"
 
 namespace FPURoundMode
 {