diff --git a/src/libsodium/include/sodium/private/common.h b/src/libsodium/include/sodium/private/common.h index 4d892f92..1d615557 100644 --- a/src/libsodium/include/sodium/private/common.h +++ b/src/libsodium/include/sodium/private/common.h @@ -230,7 +230,7 @@ xor_buf(unsigned char *out, const unsigned char *in, size_t n) #ifdef _MSC_VER -# if defined(_M_X64) || defined(_M_AMD64) || defined(_M_IX86) +# if defined(_M_X64) || defined(_M_IX86) # include # define HAVE_INTRIN_H 1 diff --git a/src/libsodium/include/sodium/private/sse2_64_32.h b/src/libsodium/include/sodium/private/sse2_64_32.h index fc994bd1..b0b66038 100644 --- a/src/libsodium/include/sodium/private/sse2_64_32.h +++ b/src/libsodium/include/sodium/private/sse2_64_32.h @@ -9,7 +9,7 @@ #if defined(HAVE_EMMINTRIN_H) && \ !(defined(__amd64) || defined(__amd64__) || defined(__x86_64__) || \ - defined(_M_X64) || defined(_M_AMD64)) + defined(_M_X64)) # include # include diff --git a/src/libsodium/sodium/runtime.c b/src/libsodium/sodium/runtime.c index c3fc2e03..bd3cf5fc 100644 --- a/src/libsodium/sodium/runtime.c +++ b/src/libsodium/sodium/runtime.c @@ -150,8 +150,7 @@ _sodium_runtime_arm_cpu_features(CPUFeatures * const cpu_features) static void _cpuid(unsigned int cpu_info[4U], const unsigned int cpu_info_type) { -#if defined(_MSC_VER) && \ - (defined(_M_X64) || defined(_M_AMD64) || defined(_M_IX86)) +#if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86)) __cpuid((int *) cpu_info, cpu_info_type); #elif defined(HAVE_CPUID) cpu_info[0] = cpu_info[1] = cpu_info[2] = cpu_info[3] = 0;