Merge 7973cc5a37 into 4ec3be8bfa

c/blake3_dispatch.c

@@ -6,12 +6,9 @@
 #include "blake3_impl.h"
 #include "blake3_thread.h"
 
-#if defined(_MSC_VER)
-#include <Windows.h>
-#endif
-
 #if defined(IS_X86)
 #if defined(_MSC_VER)
+#include <Windows.h>
 #include <intrin.h>
 #elif defined(__GNUC__)
 #include <immintrin.h>

c/blake3_impl.h

@@ -29,7 +29,7 @@ enum blake3_flags {
 #define INLINE static inline __attribute__((always_inline))
 #endif
 
-#if (defined(__x86_64__) || defined(_M_X64)) && !defined(_M_ARM64EC)
+#if defined(__x86_64__) || defined(_M_X64) 
 #define IS_X86
 #define IS_X86_64
 #endif
@@ -39,7 +39,7 @@ enum blake3_flags {
 #define IS_X86_32
 #endif
 
-#if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
+#if defined(__aarch64__) || defined(_M_ARM64)
 #define IS_AARCH64
 #endif