From 72426ed9c09bfc18ae0db7c8b62fa84e06a9e16e Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Tue, 28 Feb 2017 15:25:37 +0100
Subject: [PATCH] Always include <intrin.h> on Visual Studio x86/x86_64

---
 .../crypto_generichash/blake2b/ref/blake2b-compress-ssse3.c    | 3 ---
 src/libsodium/include/sodium/private/common.h                  | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-ssse3.c b/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-ssse3.c
index 401f42c1..14f5eb67 100644
--- a/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-ssse3.c
+++ b/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-ssse3.c
@@ -12,9 +12,6 @@
 #  pragma GCC target("ssse3")
 # endif
 
-#ifdef _MSC_VER
-# include <intrin.h> /* for _mm_set_epi64x */
-#endif
 #include <emmintrin.h>
 #include <tmmintrin.h>
 
diff --git a/src/libsodium/include/sodium/private/common.h b/src/libsodium/include/sodium/private/common.h
index d002b314..e814472d 100644
--- a/src/libsodium/include/sodium/private/common.h
+++ b/src/libsodium/include/sodium/private/common.h
@@ -194,6 +194,9 @@ store32_be(uint8_t dst[4], uint32_t w)
 
 #if defined(_MSC_VER) && \
     (defined(_M_X64) || defined(_M_AMD64) || defined(_M_IX86))
+
+#include <intrin.h>
+
 # define HAVE_MMINTRIN_H  1
 # define HAVE_EMMINTRIN_H 1
 # define HAVE_PMMINTRIN_H 1