Compile salsa20-xmm6int only if HAVE_EMMINTRIN_H is defined

This is redundant with the next check, and needs to be adjusted for Visual Studio
This commit is contained in:
Frank Denis 2017-02-26 17:41:03 +01:00
parent e4a43d5cff
commit 0a4418a25f

View File

@ -3,6 +3,8 @@
#include <stdlib.h>
#include <string.h>
#if defined(HAVE_EMMINTRIN_H) && defined(__x86_64__)
#if defined(HAVE_EMMINTRIN_H) || \
(defined(_MSC_VER) && \
(defined(_M_X64) || defined(_M_AMD64) || defined(_M_IX86)))
@ -19,7 +21,6 @@
#include "../stream_salsa20.h"
#include "stream_salsa20_xmm6int.h"
#define ROUNDS 20
typedef struct salsa_ctx {
@ -183,3 +184,5 @@ struct crypto_stream_salsa20_implementation
SODIUM_C99(.stream =) stream_ref,
SODIUM_C99(.stream_xor_ic =) stream_ref_xor_ic
};
#endif