From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Sat, 22 Jan 2022 18:52:12 +0000 (-0800)
Subject: Remove zutil.h includes from many files to prevent zlib.h being included.
X-Git-Tag: 2.1.0-beta1~408
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab0a6d9fa75c004fa8db569af5043504fdfad68f;p=thirdparty%2Fzlib-ng.git

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

diff --git a/adler32.c b/adler32.c
index 499adbb60..42e7b0fe2 100644
--- 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 3d49a5b84..bd3547d0b 100644
--- 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 d85f402a0..c6327167a 100644
--- 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 fd50b39a6..ff0a9b580 100644
--- 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 1e0f0ca46..87386e946 100644
--- 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 f7587f3da..57357d59c 100644
--- 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 7a9a56a09..358869bc6 100644
--- 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 577b0e2ef..59b86f15c 100644
--- 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 fd9481bfd..07f57f283 100644
--- 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 5f30b5e3e..37a847c45 100644
--- 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 6e429d627..d801c8ccb 100644
--- 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 9ed54b37e..5272aed01 100644
--- 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 945b29ef9..aec506261 100644
--- 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 48cdd9df6..4cc70771f 100644
--- 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 c451c0d16..dced2895d 100644
--- 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 415088c5f..68c0cf543 100644
--- 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 7771c369c..1800ed0a0 100644
--- 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 371ddf137..ae54c579f 100644
--- 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 81582c353..fa8195e08 100644
--- 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 1435fab97..0053ef982 100644
--- 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"