From b69d3f13cba0d29b66462e82974dc01c75510e8e Mon Sep 17 00:00:00 2001
From: Florent Castelli <florent.castelli@gmail.com>
Date: Wed, 8 Mar 2017 06:38:05 +0100
Subject: [PATCH] common: Don't include intrin.h in a namespace

Fixes compilation with VS2017
---
 Source/Core/Common/MathUtil.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Source/Core/Common/MathUtil.h b/Source/Core/Common/MathUtil.h
index c5409be663..e91358c5c1 100644
--- a/Source/Core/Common/MathUtil.h
+++ b/Source/Core/Common/MathUtil.h
@@ -10,6 +10,10 @@
 
 #include "Common/CommonTypes.h"
 
+#ifdef _MSC_VER
+#include <intrin.h>
+#endif
+
 namespace MathUtil
 {
 template <typename T>
@@ -24,7 +28,6 @@ constexpr T SNANConstant()
 // will use __builtin_nans, which is improperly handled by the compiler and generates
 // a bad constant. Here we go back to the version MSVC used before the builtin.
 // TODO: Remove this and use numeric_limits directly whenever this bug is fixed.
-#include <intrin.h>
 
 template <>
 constexpr double SNANConstant()