From ea7f03d9b4889be65a39250143176175be8c10ee Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Wed, 1 Mar 2017 10:32:28 +0100
Subject: [PATCH] Define HAVE_INTRIN_H on Windows; no need to reinclude it in
 runtime.c

---
 src/libsodium/include/sodium/private/common.h | 1 +
 src/libsodium/sodium/runtime.c                | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/libsodium/include/sodium/private/common.h b/src/libsodium/include/sodium/private/common.h
index ffe4d604..853c205e 100644
--- a/src/libsodium/include/sodium/private/common.h
+++ b/src/libsodium/include/sodium/private/common.h
@@ -197,6 +197,7 @@ store32_be(uint8_t dst[4], uint32_t w)
 
 #include <intrin.h>
 
+# define HAVE_INTRIN_H    1
 # define HAVE_MMINTRIN_H  1
 # define HAVE_EMMINTRIN_H 1
 # define HAVE_PMMINTRIN_H 1
diff --git a/src/libsodium/sodium/runtime.c b/src/libsodium/sodium/runtime.c
index 3e150ad8..fd64003d 100644
--- a/src/libsodium/sodium/runtime.c
+++ b/src/libsodium/sodium/runtime.c
@@ -3,10 +3,6 @@
 #ifdef HAVE_ANDROID_GETCPUFEATURES
 # include <cpu-features.h>
 #endif
-#if defined(HAVE_INTRIN_H) || (defined(_MSC_VER) && \
-     (defined(_M_X64) || defined(_M_AMD64) || defined(_M_IX86)))
-# include <intrin.h>
-#endif
 
 #include "private/common.h"
 #include "runtime.h"