cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Define HAVE_INTRIN_H on Windows; no need to reinclude it in runtime.c

Browse Source
This commit is contained in:
Frank Denis 2017-03-01 10:32:28 +01:00
parent ed57801379
commit ea7f03d9b4
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libsodium/include/sodium/private/common.h
View File

@ -197,6 +197,7 @@ store32_be(uint8_t dst[4], uint32_t w)
#include <intrin.h> #include <intrin.h>
# define HAVE_INTRIN_H 1
# define HAVE_MMINTRIN_H 1 # define HAVE_MMINTRIN_H 1
# define HAVE_EMMINTRIN_H 1 # define HAVE_EMMINTRIN_H 1
# define HAVE_PMMINTRIN_H 1 # define HAVE_PMMINTRIN_H 1

4
src/libsodium/sodium/runtime.c
View File

@ -3,10 +3,6 @@
#ifdef HAVE_ANDROID_GETCPUFEATURES #ifdef HAVE_ANDROID_GETCPUFEATURES
# include <cpu-features.h> # include <cpu-features.h>
#endif #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 "private/common.h"
#include "runtime.h" #include "runtime.h"