From 03cff6abcaaa4ef12675f0b0c5b9b48255674a5e Mon Sep 17 00:00:00 2001
From: Erik Hofman <erik@ehofman.com>
Date: Sun, 1 Jan 2017 13:26:36 +0100
Subject: [PATCH] Fix Never use <avxintrin.h> directly; include <immintrin.h>
 instead.

---
 simgear/math/simd.hxx    | 3 ++-
 simgear/math/simd4x4.hxx | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/simgear/math/simd.hxx b/simgear/math/simd.hxx
index 122a8068..8eb9d6b4 100644
--- a/simgear/math/simd.hxx
+++ b/simgear/math/simd.hxx
@@ -506,7 +506,8 @@ inline simd4_t<float,N>abs(simd4_t<float,N> v) {
 
 # ifdef __AVX__
 #  include <pmmintrin.h>
-#  include <avxintrin.h>
+#  include <immintrin.h>
+//#  include <avxintrin-emu.h>
 
 template<int N>
 class simd4_t<double,N>
diff --git a/simgear/math/simd4x4.hxx b/simgear/math/simd4x4.hxx
index 0a774b2f..6cee42d1 100644
--- a/simgear/math/simd4x4.hxx
+++ b/simgear/math/simd4x4.hxx
@@ -517,7 +517,8 @@ inline simd4_t<float,3> transform<float>(const simd4x4_t<float,4>& m, const simd
 
 # ifdef __AVX__
 #  include <pmmintrin.h>
-#  include <avxintrin.h>
+#  include <immintrin.h>
+//#  include <avxintrin-emu.h>
 
 template<>
 class simd4x4_t<double,4>