Use _M_X64 only without mixing with _M_AMD64

diff --git a/lib/common/compiler.h b/lib/common/compiler.h
index 6fd2d08e7317384d5dd29d32b262aeece5f0e33e..0dad74c7d3637bcbc5ee3c02398d87159adbadbe 100644 (file)
--- a/lib/common/compiler.h
+++ b/lib/common/compiler.h
@@ -227,7 +227,7 @@
 #  if defined(__AVX2__)
 #    define ZSTD_ARCH_X86_AVX2
 #  endif
-#  if defined(__SSE2__) || defined(_M_AMD64) || (defined (_M_IX86) && defined(_M_IX86_FP) && (_M_IX86_FP >= 2))
+#  if defined(__SSE2__) || defined(_M_X64) || (defined (_M_IX86) && defined(_M_IX86_FP) && (_M_IX86_FP >= 2))
 #    define ZSTD_ARCH_X86_SSE2
 #  endif
 #  if defined(__ARM_NEON) || defined(_M_ARM64)

diff --git a/lib/common/mem.h b/lib/common/mem.h
index ca756e23711083be8e19949e93f347a835742748..e66a2eaeb27c7ec80def54bd4dee50c48ecf308d 100644 (file)
--- a/lib/common/mem.h
+++ b/lib/common/mem.h
@@ -147,7 +147,7 @@ MEM_STATIC unsigned MEM_isLittleEndian(void)
     return 1;
 #elif defined(__clang__) && __BIG_ENDIAN__
     return 0;
-#elif defined(_MSC_VER) && (_M_AMD64 || _M_IX86)
+#elif defined(_MSC_VER) && (_M_X64 || _M_IX86)
     return 1;
 #elif defined(__DMC__) && defined(_M_IX86)
     return 1;

diff --git a/lib/common/xxhash.h b/lib/common/xxhash.h
index 68ec6b29fd182d86ec93c0e32c42026180dfb058..b6af402fdf4c9a39207974448a0525e20631c115 100644 (file)
--- a/lib/common/xxhash.h
+++ b/lib/common/xxhash.h
@@ -3892,7 +3892,7 @@ enum XXH_VECTOR_TYPE /* fake enum */ {
 #    define XXH_VECTOR XXH_AVX512
 #  elif defined(__AVX2__)
 #    define XXH_VECTOR XXH_AVX2
-#  elif defined(__SSE2__) || defined(_M_AMD64) || defined(_M_X64) || (defined(_M_IX86_FP) && (_M_IX86_FP == 2))
+#  elif defined(__SSE2__) || defined(_M_X64) || (defined(_M_IX86_FP) && (_M_IX86_FP == 2))
 #    define XXH_VECTOR XXH_SSE2
 #  elif (defined(__PPC64__) && defined(__POWER8_VECTOR__)) \
      || (defined(__s390x__) && defined(__VEC__)) \