From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Sun, 6 Feb 2022 18:06:02 +0000 (-0800)
Subject: Remove unnecessary zutil.h includes.
X-Git-Tag: 2.1.0-beta1~383
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5eefff644e382305a7b64f061344aecb73fad88b;p=thirdparty%2Fzlib-ng.git

Remove unnecessary zutil.h includes.
---

diff --git a/arch/arm/adler32_neon.c b/arch/arm/adler32_neon.c
index adda6f61..8f493444 100644
--- 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 bef9b290..195c9499 100644
--- 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 e0ad3e04..1e173b90 100644
--- 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 88ba6c38..6f6ed453 100644
--- 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 fc408632..f39f0024 100644
--- 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 3b5c3e2f..6b7d9153 100644
--- 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 a76f6633..e66de9ed 100644
--- 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 7b0ec93b..8c8f2153 100644
--- 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 17414b39..c418ed4f 100644
--- 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 60c5e53f..9186b40d 100644
--- 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 3465a573..e7a61095 100644
--- 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 519f97ea..c498e3ec 100644
--- 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 1051d116..465fe0f3 100644
--- 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 1e27b238..5ab9e92e 100644
--- 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);