Remove unnecessary zutil.h includes.

diff --git a/arch/arm/adler32_neon.c b/arch/arm/adler32_neon.c
index adda6f61d8010ea59d029c6720a9c8c9b08923b9..8f4934440439f69f76ad40f05187085d7df71524 100644 (file)
--- a/arch/arm/adler32_neon.c
+++ b/arch/arm/adler32_neon.c
@@ -10,7 +10,7 @@
 #else
 #  include <arm_neon.h>
 #endif
-#include "../../zutil.h"
+#include "../../zbuild.h"
 #include "../../adler32_p.h"
 
 static void NEON_accum32(uint32_t *s, const unsigned char *buf, size_t len) {

diff --git a/arch/arm/arm_features.c b/arch/arm/arm_features.c
index bef9b290ad232d42b279552774f0947e08143df2..195c94992de9708dacde6c8f116d0b1223c5e467 100644 (file)
--- a/arch/arm/arm_features.c
+++ b/arch/arm/arm_features.c
@@ -1,4 +1,4 @@
-#include "../../zutil.h"
+#include "../../zbuild.h"
 
 #if defined(__linux__)
 #  include <sys/auxv.h>

diff --git a/arch/arm/chunkset_neon.c b/arch/arm/chunkset_neon.c
index e0ad3e04ea7ef3976d12b74a0ae432144f3e8785..1e173b90758375290733617ec741647d9549a7c6 100644 (file)
--- a/arch/arm/chunkset_neon.c
+++ b/arch/arm/chunkset_neon.c
@@ -9,7 +9,6 @@
 #  include <arm_neon.h>
 #endif
 #include "../../zbuild.h"
-#include "../../zutil.h"
 
 typedef uint8x16_t chunk_t;
 

diff --git a/arch/arm/crc32_acle.c b/arch/arm/crc32_acle.c
index 88ba6c38c61d86070762cb1319642487f1b9c42e..6f6ed45373fec5a7a1d0f6240989ee2e310ea7f9 100644 (file)
--- a/arch/arm/crc32_acle.c
+++ b/arch/arm/crc32_acle.c
@@ -9,7 +9,7 @@
 #ifndef _MSC_VER
 #  include <arm_acle.h>
 #endif
-#include "../../zutil.h"
+#include "../../zbuild.h"
 
 uint32_t crc32_acle(uint32_t crc, const unsigned char *buf, uint64_t len) {
     Z_REGISTER uint32_t c;

diff --git a/arch/power/adler32_power8.c b/arch/power/adler32_power8.c
index fc4086322efcdbeb6cb752277f27e3194900d18e..f39f00246c799f3eb206170e05233abb67b5a6b3 100644 (file)
--- a/arch/power/adler32_power8.c
+++ b/arch/power/adler32_power8.c
@@ -40,7 +40,6 @@
 
 #include <altivec.h>
 #include "zbuild.h"
-#include "zutil.h"
 #include "adler32_p.h"
 
 /* Vector across sum unsigned int (saturate).  */

diff --git a/arch/power/adler32_vmx.c b/arch/power/adler32_vmx.c
index 3b5c3e2f7e3a60d57c821fdc3cee625781e57c8f..6b7d9153b4533e2b65a27a037f2871acac6e1792 100644 (file)
--- a/arch/power/adler32_vmx.c
+++ b/arch/power/adler32_vmx.c
@@ -7,7 +7,7 @@
 
 #ifdef PPC_VMX_ADLER32
 #include <altivec.h>
-#include "zutil.h"
+#include "zbuild.h"
 #include "adler32_p.h"
 
 #define vmx_zero()  (vec_splat_u32(0))
@@ -35,7 +35,7 @@ static void vmx_accum32(uint32_t *s, const unsigned char *buf, size_t len) {
     vector unsigned int pair_vec = vec_ld(0, s);
     adacc = vec_perm(pair_vec, pair_vec, s0_perm);
     s2acc = vec_slo(pair_vec, shift_vec);
-    
+
     vector unsigned int zero = vmx_zero();
     vector unsigned int s3acc = zero;
     vector unsigned int s3acc_0 = zero;

diff --git a/arch/power/chunkset_power8.c b/arch/power/chunkset_power8.c
index a76f66334cfaa2b1fcb2344fe48a7b8518b659f0..e66de9ed295f69386b306e47fc4f06a0ccb88be9 100644 (file)
--- a/arch/power/chunkset_power8.c
+++ b/arch/power/chunkset_power8.c
@@ -4,8 +4,7 @@
 
 #ifdef POWER8_VSX_CHUNKSET
 #include <altivec.h>
-#include "zbuild.h"
-#include "zutil.h"
+#include "../../zbuild.h"
 
 typedef vector unsigned char chunk_t;
 

diff --git a/arch/power/crc32_constants.h b/arch/power/crc32_constants.h
index 7b0ec93b4a9f2f610a59cc6b8acded09594f474b..8c8f2153b60e1df6ed4419c70db04173947b029c 100644 (file)
--- a/arch/power/crc32_constants.h
+++ b/arch/power/crc32_constants.h
@@ -7,7 +7,7 @@
  */
 
 #include "zendian.h"
-#include "zutil.h"
+#include "zbuild.h"
 
 /* Reduce 262144 kbits to 1024 bits */
 static const __vector unsigned long long vcrc_const[255] ALIGNED_(16) = {

diff --git a/arch/power/crc32_power8.c b/arch/power/crc32_power8.c
index 17414b394e5c433f147efe011edaa21c7ae33d1e..c418ed4f487e7ed41237bcaac2b4913b7342802e 100644 (file)
--- a/arch/power/crc32_power8.c
+++ b/arch/power/crc32_power8.c
@@ -27,7 +27,7 @@
 
 #include <altivec.h>
 #include "zendian.h"
-#include "zutil.h"
+#include "zbuild.h"
 
 #include "crc32_constants.h"
 #include "crc32_tbl.h"

diff --git a/arch/power/power_features.c b/arch/power/power_features.c
index 60c5e53f2f11d8a29112dfe77772693348343d46..9186b40d83a67380ad1f9a2d48742126d776de88 100644 (file)
--- a/arch/power/power_features.c
+++ b/arch/power/power_features.c
@@ -5,7 +5,7 @@
  */
 
 #include <sys/auxv.h>
-#include "../../zutil.h"
+#include "../../zbuild.h"
 #include "power_features.h"
 
 Z_INTERNAL int power_cpu_has_altivec = 0;

diff --git a/arch/s390/crc32-vx.c b/arch/s390/crc32-vx.c
index 3465a573233f938461ae7768c2da82f1699fb986..e7a6109502705214994ae705a8b1cf2c2354f24c 100644 (file)
--- a/arch/s390/crc32-vx.c
+++ b/arch/s390/crc32-vx.c
@@ -12,7 +12,7 @@
  * relicensed under the zlib license.
  */
 
-#include "zutil.h"
+#include "../../zbuild.h"
 #include "crc32_p.h"
 
 #include <vecintrin.h>

diff --git a/arch/s390/dfltcc_deflate.c b/arch/s390/dfltcc_deflate.c
index 519f97ea598b6531767f35563bea7cb41d589337..c498e3ecaff01e6c9f5092392b1b35e0bf033483 100644 (file)
--- a/arch/s390/dfltcc_deflate.c
+++ b/arch/s390/dfltcc_deflate.c
@@ -14,7 +14,6 @@
 */
 
 #include "zbuild.h"
-#include "zutil.h"
 #include "deflate.h"
 #include "trees_emit.h"
 #include "dfltcc_deflate.h"

diff --git a/arch/s390/s390_features.c b/arch/s390/s390_features.c
index 1051d116a0d450e72f8e8f94190797131bd028b4..465fe0f3763e2c805459d49c68af29a28b0eb279 100644 (file)
--- a/arch/s390/s390_features.c
+++ b/arch/s390/s390_features.c
@@ -1,4 +1,4 @@
-#include "zutil.h"
+#include "../../zbuild.h"
 #include "s390_features.h"
 
 #include <sys/auxv.h>

diff --git a/arch/s390/s390_features.h b/arch/s390/s390_features.h
index 1e27b2386510cb80cae5ac30d3a52cb4524b12f2..5ab9e92ee78b3a1be053ffd3e2fd96e7dfe54cf8 100644 (file)
--- a/arch/s390/s390_features.h
+++ b/arch/s390/s390_features.h
@@ -1,8 +1,6 @@
 #ifndef S390_FEATURES_H_
 #define S390_FEATURES_H_
 
-#include "zutil.h"
-
 extern int s390_cpu_has_vx;
 
 void Z_INTERNAL s390_check_features(void);