Move cpu_feature includes out of zutil.h.

diff --git a/arch/x86/crc32_fold_pclmulqdq.c b/arch/x86/crc32_fold_pclmulqdq.c
index a01cdf775cec4b402a6867ce4831d5f9ede09b2d..6e429d6274b51bab3d4009a20eb982f3fb8849f3 100644 (file)
--- a/arch/x86/crc32_fold_pclmulqdq.c
+++ b/arch/x86/crc32_fold_pclmulqdq.c
@@ -24,6 +24,8 @@
 #include <wmmintrin.h>
 #include <smmintrin.h> // _mm_extract_epi32
 
+#include "x86.h"
+
 #include "../../crc32_fold.h"
 
 #ifdef X86_VPCLMULQDQ_CRC

diff --git a/cpu_features.c b/cpu_features.c
index 70bfcb698cb364f652ecc08b0fc942657cb3ea01..6ef5aa2c4b4839e89adc5c0de18addfe583ac934 100644 (file)
--- a/cpu_features.c
+++ b/cpu_features.c
@@ -4,7 +4,8 @@
  */
 
 #include "zbuild.h"
-#include "zutil.h"
+
+#include "cpu_features.h"
 
 Z_INTERNAL void cpu_check_features(void) {
     static int features_checked = 0;

diff --git a/cpu_features.h b/cpu_features.h
index 103356b3e6d51b2ae2e6a61adc8370126c37b881..7dea3a683005f69eb8ef615f93751b80d25e44a8 100644 (file)
--- a/cpu_features.h
+++ b/cpu_features.h
@@ -9,8 +9,15 @@
 #include "deflate.h"
 #include "crc32_fold.h"
 
-#ifdef X86_FEATURES
+#if defined(X86_FEATURES)
+#  include "arch/x86/x86.h"
 #  include "fallback_builtins.h"
+#elif defined(ARM_FEATURES)
+#  include "arch/arm/arm.h"
+#elif defined(PPC_FEATURES) || defined(POWER_FEATURES)
+#  include "arch/power/power.h"
+#elif defined(S390_FEATURES)
+#  include "arch/s390/s390.h"
 #endif
 
 extern void cpu_check_features();

diff --git a/deflate.c b/deflate.c
index 8f569bf2e57bba2bbb9c271df1eefd0b3ebb51f3..5919cdb36406d6b71a5f380ca584e6e3903a4e1f 100644 (file)
--- a/deflate.c
+++ b/deflate.c
@@ -48,6 +48,7 @@
  */
 
 #include "zbuild.h"
+#include "cpu_features.h"
 #include "deflate.h"
 #include "deflate_p.h"
 #include "functable.h"

diff --git a/inflate.c b/inflate.c
index 44a50e61c72565556d4e0f89254f1e85ec599a7e..1e8806a490d345564475c074ad566fe6d14e43e4 100644 (file)
--- a/inflate.c
+++ b/inflate.c
@@ -5,6 +5,7 @@
 
 #include "zbuild.h"
 #include "zutil.h"
+#include "cpu_features.h"
 #include "inftrees.h"
 #include "inflate.h"
 #include "inffast.h"

diff --git a/zutil.h b/zutil.h
index 660fabdacdfee5f38e3745b8f2e41725a17adeff..324fd992ee9333dca5c3c5315f095c513f61df1e 100644 (file)
--- a/zutil.h
+++ b/zutil.h
@@ -259,14 +259,4 @@ void Z_INTERNAL   zng_cfree(void *opaque, void *ptr);
 #  define ALIGNED_(x) __declspec(align(x))
 #endif
 
-#if defined(X86_FEATURES)
-#  include "arch/x86/x86.h"
-#elif defined(ARM_FEATURES)
-#  include "arch/arm/arm.h"
-#elif defined(PPC_FEATURES) || defined(POWER_FEATURES)
-#  include "arch/power/power.h"
-#elif defined(S390_FEATURES)
-#  include "arch/s390/s390.h"
-#endif
-
 #endif /* ZUTIL_H_ */