Remove zutil.h includes from many files to prevent zlib.h being included.

diff --git a/adler32.c b/adler32.c
index 499adbb60bb3c1a0dc474920fb37220f8b0c7f34..42e7b0fe25fa5f205a0edec4810e61875831a190 100644 (file)
--- a/adler32.c
+++ b/adler32.c
@@ -4,7 +4,6 @@
  */
 
 #include "zbuild.h"
-#include "zutil.h"
 #include "functable.h"
 #include "adler32_p.h"
 

diff --git a/arch/x86/adler32_avx2.c b/arch/x86/adler32_avx2.c
index 3d49a5b848d1867cf4002fe9896b43d2216e6270..bd3547d0b13b8760b3d07e74643605a85944f412 100644 (file)
--- a/arch/x86/adler32_avx2.c
+++ b/arch/x86/adler32_avx2.c
@@ -6,8 +6,6 @@
  */
 
 #include "../../zbuild.h"
-#include "../../zutil.h"
-
 #include "../../adler32_p.h"
 #include "../../fallback_builtins.h"
 

diff --git a/arch/x86/adler32_avx512.c b/arch/x86/adler32_avx512.c
index d85f402a067f2da14425ae637c36c4576d689857..c6327167a5c4ee528823ca666b2434437cbf1b41 100644 (file)
--- a/arch/x86/adler32_avx512.c
+++ b/arch/x86/adler32_avx512.c
@@ -7,8 +7,6 @@
  */
 
 #include "../../zbuild.h"
-#include "../../zutil.h"
-
 #include "../../adler32_p.h"
 #include "../../cpu_features.h"
 #include "../../fallback_builtins.h"

diff --git a/arch/x86/adler32_avx512_vnni.c b/arch/x86/adler32_avx512_vnni.c
index fd50b39a6bb032098801717ca6b0452a33f20f24..ff0a9b580b9adfc9d127b386c2bec028aa1fe0c7 100644 (file)
--- a/arch/x86/adler32_avx512_vnni.c
+++ b/arch/x86/adler32_avx512_vnni.c
@@ -8,8 +8,6 @@
  */
 
 #include "../../zbuild.h"
-#include "../../zutil.h"
-
 #include "../../adler32_p.h"
 #include "../../cpu_features.h"
 #include "../../fallback_builtins.h"

diff --git a/arch/x86/adler32_sse41.c b/arch/x86/adler32_sse41.c
index 1e0f0ca46322e77f20ce41757f736b5987836374..87386e9460ca4c18ce5c53aaa11223e06a8adb63 100644 (file)
--- a/arch/x86/adler32_sse41.c
+++ b/arch/x86/adler32_sse41.c
@@ -7,8 +7,6 @@
  */
 
 #include "../../zbuild.h"
-#include "../../zutil.h"
-
 #include "../../adler32_p.h"
 
 #ifdef X86_SSE41_ADLER32

diff --git a/arch/x86/adler32_ssse3.c b/arch/x86/adler32_ssse3.c
index f7587f3da16ca30a963a76a5d611dc152464ab24..57357d59c992b23feabe30ecba22d9cc0fa4468d 100644 (file)
--- a/arch/x86/adler32_ssse3.c
+++ b/arch/x86/adler32_ssse3.c
@@ -6,8 +6,6 @@
  */
 
 #include "../../zbuild.h"
-#include "../../zutil.h"
-
 #include "../../adler32_p.h"
 
 #ifdef X86_SSSE3_ADLER32

diff --git a/arch/x86/chunkset_avx.c b/arch/x86/chunkset_avx.c
index 7a9a56a096d395c56e818e89d5e94a1b271c854b..358869bc6a7b985644192ad3d4947e8c0836e6d8 100644 (file)
--- a/arch/x86/chunkset_avx.c
+++ b/arch/x86/chunkset_avx.c
@@ -2,7 +2,6 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 #include "zbuild.h"
-#include "zutil.h"
 
 #ifdef X86_AVX_CHUNKSET
 #include <immintrin.h>

diff --git a/arch/x86/chunkset_sse2.c b/arch/x86/chunkset_sse2.c
index 577b0e2ef48916a199be0ff9b25cf727353398fb..59b86f15cac75f6e265814298db650fbb3f2a3fd 100644 (file)
--- a/arch/x86/chunkset_sse2.c
+++ b/arch/x86/chunkset_sse2.c
@@ -3,7 +3,6 @@
  */
 
 #include "zbuild.h"
-#include "zutil.h"
 
 #ifdef X86_SSE2
 #include <immintrin.h>

diff --git a/arch/x86/compare256_avx2.c b/arch/x86/compare256_avx2.c
index fd9481bfdef6c629a5112e6996a0389c5d76f7ec..07f57f2839af148b4be4b72ca1189b92b9c6ca81 100644 (file)
--- a/arch/x86/compare256_avx2.c
+++ b/arch/x86/compare256_avx2.c
@@ -4,7 +4,6 @@
  */
 
 #include "../../zbuild.h"
-#include "../../zutil.h"
 
 #include "fallback_builtins.h"
 

diff --git a/arch/x86/compare256_sse42.c b/arch/x86/compare256_sse42.c
index 5f30b5e3ed9622a323eef88cc0925db90b73ed23..37a847c45c26bec4553bcb4e3ec90bc2b5ed0c25 100644 (file)
--- a/arch/x86/compare256_sse42.c
+++ b/arch/x86/compare256_sse42.c
@@ -16,7 +16,6 @@
  */
 
 #include "../../zbuild.h"
-#include "../../zutil.h"
 
 #ifdef X86_SSE42_CMP_STR
 
@@ -30,22 +29,22 @@ static inline uint32_t compare256_unaligned_sse4_static(const uint8_t *src0, con
     uint32_t len = 0;
 
     do {
-        #define mode _SIDD_UBYTE_OPS | _SIDD_CMP_EQUAL_EACH | _SIDD_NEGATIVE_POLARITY
+        #define cmp_mode _SIDD_UBYTE_OPS | _SIDD_CMP_EQUAL_EACH | _SIDD_NEGATIVE_POLARITY
         __m128i xmm_src0, xmm_src1;
         uint32_t ret;
 
         xmm_src0 = _mm_loadu_si128((__m128i *)src0);
         xmm_src1 = _mm_loadu_si128((__m128i *)src1);
-        ret = (uint32_t)_mm_cmpestri(xmm_src0, 16, xmm_src1, 16, mode);
-        if (_mm_cmpestrc(xmm_src0, 16, xmm_src1, 16, mode)) {
+        ret = (uint32_t)_mm_cmpestri(xmm_src0, 16, xmm_src1, 16, cmp_mode);
+        if (_mm_cmpestrc(xmm_src0, 16, xmm_src1, 16, cmp_mode)) {
             return len + ret;
         }
         src0 += 16, src1 += 16, len += 16;
 
         xmm_src0 = _mm_loadu_si128((__m128i *)src0);
         xmm_src1 = _mm_loadu_si128((__m128i *)src1);
-        ret = (uint32_t)_mm_cmpestri(xmm_src0, 16, xmm_src1, 16, mode);
-        if (_mm_cmpestrc(xmm_src0, 16, xmm_src1, 16, mode)) {
+        ret = (uint32_t)_mm_cmpestri(xmm_src0, 16, xmm_src1, 16, cmp_mode);
+        if (_mm_cmpestrc(xmm_src0, 16, xmm_src1, 16, cmp_mode)) {
             return len + ret;
         }
         src0 += 16, src1 += 16, len += 16;

diff --git a/arch/x86/crc32_fold_pclmulqdq.c b/arch/x86/crc32_fold_pclmulqdq.c
index 6e429d6274b51bab3d4009a20eb982f3fb8849f3..d801c8ccb1c5797c561f1fbdbacd63fc9edeaa6f 100644 (file)
--- a/arch/x86/crc32_fold_pclmulqdq.c
+++ b/arch/x86/crc32_fold_pclmulqdq.c
@@ -17,7 +17,7 @@
  */
 
 #ifdef X86_PCLMULQDQ_CRC
-#include "../../zutil.h"
+#include "../../zbuild.h"
 
 #include <stdint.h>
 #include <immintrin.h>

diff --git a/arch/x86/crc32_fold_vpclmulqdq.c b/arch/x86/crc32_fold_vpclmulqdq.c
index 9ed54b37e32fa4b35f0a8f5451fa7092024fe2b0..5272aed013c2aeb2475561fafb1f6673cd661bef 100644 (file)
--- a/arch/x86/crc32_fold_vpclmulqdq.c
+++ b/arch/x86/crc32_fold_vpclmulqdq.c
@@ -4,7 +4,7 @@
  */
 
 #ifdef X86_VPCLMULQDQ_CRC
-#include "../../zutil.h"
+#include "../../zbuild.h"
 
 #include <immintrin.h>
 
@@ -14,9 +14,9 @@ size_t fold_16_vpclmulqdq(__m128i *xmm_crc0, __m128i *xmm_crc1,
     __m512i zmm_t0, zmm_t1, zmm_t2, zmm_t3;
     __m512i zmm_crc0, zmm_crc1, zmm_crc2, zmm_crc3;
     __m512i z0, z1, z2, z3;
-    z_const __m512i zmm_fold4 = _mm512_set4_epi32(
+    const __m512i zmm_fold4 = _mm512_set4_epi32(
         0x00000001, 0x54442bd4, 0x00000001, 0xc6e41596);
-    z_const __m512i zmm_fold16 = _mm512_set4_epi32(
+    const __m512i zmm_fold16 = _mm512_set4_epi32(
         0x00000001, 0x1542778a, 0x00000001, 0x322d1430);
 
     // zmm register init

diff --git a/arch/x86/x86.c b/arch/x86/x86.c
index 945b29ef94c5cbee6ece308705dba4708da5525c..aec506261608c32cd9ba366c416564b8bd4eea2d 100644 (file)
--- a/arch/x86/x86.c
+++ b/arch/x86/x86.c
@@ -7,7 +7,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-#include "../../zutil.h"
+#include "../../zbuild.h"
 
 #ifdef _MSC_VER
 #  include <intrin.h>

diff --git a/chunkset.c b/chunkset.c
index 48cdd9df6f0e44be1d8c5daef1eb7505630c4a3d..4cc70771f62da732bc42bf751a076a3f3ccd27fa 100644 (file)
--- a/chunkset.c
+++ b/chunkset.c
@@ -3,7 +3,6 @@
  */
 
 #include "zbuild.h"
-#include "zutil.h"
 
 /* Define 8 byte chunks differently depending on unaligned support */
 #if defined(UNALIGNED64_OK)

diff --git a/chunkset_tpl.h b/chunkset_tpl.h
index c451c0d16c52aef773160fe0a1ea2d01b53f1682..dced2895d8a4a81f8711a8d85e63c656077a6689 100644 (file)
--- a/chunkset_tpl.h
+++ b/chunkset_tpl.h
@@ -2,6 +2,8 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
+#include "zbuild.h"
+
 /* Returns the chunk size */
 Z_INTERNAL uint32_t CHUNKSIZE(void) {
     return sizeof(chunk_t);

diff --git a/compare256.c b/compare256.c
index 415088c5f14219539dcbdb714ad38bf7ea9677d4..68c0cf54315e9d479a8a43d4d64f5649c1611e0c 100644 (file)
--- a/compare256.c
+++ b/compare256.c
@@ -4,8 +4,6 @@
  */
 
 #include "zbuild.h"
-#include "zutil.h"
-
 #include "fallback_builtins.h"
 
 /* ALIGNED, byte comparison */

diff --git a/crc32_fold.c b/crc32_fold.c
index 7771c369cec9707981c6730ab008fd7efc9eee87..1800ed0a068d10a6c4438bfef37ffcff08c39238 100644 (file)
--- a/crc32_fold.c
+++ b/crc32_fold.c
@@ -3,7 +3,6 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 #include "zbuild.h"
-#include "zutil.h"
 #include "functable.h"
 
 #include "crc32_fold.h"

diff --git a/crc32_p.h b/crc32_p.h
index 371ddf1374ba0f82c564d8103c40ba8253984b76..ae54c579ff9d686561fba61ba63b3aebd1202c3c 100644 (file)
--- a/crc32_p.h
+++ b/crc32_p.h
@@ -1,7 +1,7 @@
 #ifndef CRC32_P_H_
 #define CRC32_P_H_
 
-#include "zutil.h"
+#include "zbuild.h"
 #include "zendian.h"
 
 #define GF2_DIM 32      /* dimension of GF(2) vectors (length of CRC) */

diff --git a/test/benchmarks/benchmark_main.cc b/test/benchmarks/benchmark_main.cc
index 81582c353a741900d4b4da59055bb9e2e041894f..fa8195e0830376426e7fb01fce2a577ebe6cba6d 100644 (file)
--- a/test/benchmarks/benchmark_main.cc
+++ b/test/benchmarks/benchmark_main.cc
@@ -11,7 +11,6 @@
 
 extern "C" {
 #  include "zbuild.h"
-#  include "zutil.h"
 #  include "cpu_features.h"
 }
 

diff --git a/uncompr.c b/uncompr.c
index 1435fab97522d4a8b6fb905f81fd921829e11025..0053ef982777308257d0996c1b03f0c3d340c097 100644 (file)
--- a/uncompr.c
+++ b/uncompr.c
@@ -3,7 +3,6 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-#define Z_INTERNAL
 #include "zbuild.h"
 #ifdef ZLIB_COMPAT
 #  include "zlib.h"