Reduce header dependencies in crt_helpers.h and machine_vectors.h

flintlib · Feb 17, 2024 · fbfabea · fbfabea
1 parent 0ba6b2c
commit fbfabea
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/src/crt_helpers.h b/src/crt_helpers.h
@@ -12,18 +12,10 @@
 #ifndef CRT_HELPERS_H
 #define CRT_HELPERS_H
 
-#if defined(__GNUC__)
-# if defined(__AVX2__)
-#  include <x86intrin.h>
-# elif defined(__ARM_NEON)
-#  include <arm_neon.h>
-# endif
-#elif defined(_MSC_VER)
-# if defined(__AVX2__)
-#  include <intrin.h>
-# elif defined(_M_ARM64)
-#  include <arm_neon.h>
-# endif
+#if defined(__GNUC__) && defined(__AVX2__)
+# include <x86gprintrin.h>
+#elif defined(_MSC_VER) && defined(__AVX2__)
+# include <intrin.h>
 #endif
 
 #include "flint.h"

diff --git a/src/machine_vectors.h b/src/machine_vectors.h
@@ -18,7 +18,7 @@
 
 #if defined(__GNUC__)
 # if defined(__AVX2__)
-#  include <x86intrin.h>
+#  include <immintrin.h>
 # elif defined(__ARM_NEON)
 #  include <arm_neon.h>
 # endif