From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Sun, 21 Jan 2024 18:45:36 +0000 (-0800)
Subject: Remove type declarations for z_stream/zng_stream from cpu_features.
X-Git-Tag: 2.2.0~108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=379eda2e802f144c957ffcd4247403dca0c33423;p=thirdparty%2Fzlib-ng.git

Remove type declarations for z_stream/zng_stream from cpu_features.
---

diff --git a/arch/arm/arm_features.h b/arch/arm/arm_features.h
index 05c23a88..722fb1c2 100644
--- a/arch/arm/arm_features.h
+++ b/arch/arm/arm_features.h
@@ -19,7 +19,6 @@ void Z_INTERNAL arm_check_features(struct arm_cpu_features *features);
 extern uint32_t adler32_neon(uint32_t adler, const uint8_t *buf, size_t len);
 extern uint32_t chunksize_neon(void);
 extern uint8_t* chunkmemset_safe_neon(uint8_t *out, unsigned dist, unsigned len, unsigned left);
-extern void     inflate_fast_neon(PREFIX3(stream) *strm, uint32_t start);
 
 #  ifdef HAVE_BUILTIN_CTZLL
     extern uint32_t compare256_neon(const uint8_t *src0, const uint8_t *src1);
@@ -31,6 +30,9 @@ extern void     inflate_fast_neon(PREFIX3(stream) *strm, uint32_t start);
 #  ifdef DEFLATE_H_
     extern void slide_hash_neon(deflate_state *s);
 #  endif
+#  ifdef INFLATE_H_
+    extern void inflate_fast_neon(PREFIX3(stream) *strm, uint32_t start);
+#  endif
 #endif
 
 #ifdef ARM_ACLE
diff --git a/arch/generic/generic_features.h b/arch/generic/generic_features.h
index 9e523da9..928f6bc8 100644
--- a/arch/generic/generic_features.h
+++ b/arch/generic/generic_features.h
@@ -12,7 +12,9 @@ typedef uint32_t (*crc32_func)(uint32_t crc32, const uint8_t *buf, size_t len);
 extern uint32_t adler32_c(uint32_t adler, const uint8_t *buf, size_t len);
 extern uint32_t chunksize_c(void);
 extern uint8_t* chunkmemset_safe_c(uint8_t *out, unsigned dist, unsigned len, unsigned left);
+#ifdef INFLATE_H_
 extern void     inflate_fast_c(PREFIX3(stream) *strm, uint32_t start);
+#endif
 
 extern uint32_t PREFIX(crc32_braid)(uint32_t crc, const uint8_t *buf, size_t len);
 
diff --git a/arch/power/power_features.h b/arch/power/power_features.h
index 43287d36..19af195b 100644
--- a/arch/power/power_features.h
+++ b/arch/power/power_features.h
@@ -29,11 +29,12 @@ extern uint32_t adler32_power8(uint32_t adler, const uint8_t *buf, size_t len);
 extern uint32_t chunksize_power8(void);
 extern uint8_t* chunkmemset_safe_power8(uint8_t *out, unsigned dist, unsigned len, unsigned left);
 extern uint32_t crc32_power8(uint32_t crc, const uint8_t *buf, size_t len);
-extern void     inflate_fast_power8(PREFIX3(stream) *strm, uint32_t start);
-
 #  ifdef DEFLATE_H_
     extern void slide_hash_power8(deflate_state *s);
 #  endif
+#  ifdef INFLATE_H_
+    extern void inflate_fast_power8(PREFIX3(stream) *strm, uint32_t start);
+#  endif
 #endif
 
 #ifdef POWER9
diff --git a/arch/riscv/riscv_features.h b/arch/riscv/riscv_features.h
index 1aada419..b6f48cc1 100644
--- a/arch/riscv/riscv_features.h
+++ b/arch/riscv/riscv_features.h
@@ -23,12 +23,15 @@ extern uint32_t adler32_fold_copy_rvv(uint32_t adler, uint8_t *dst, const uint8_
 extern uint32_t chunksize_rvv(void);
 extern uint8_t* chunkmemset_safe_rvv(uint8_t *out, unsigned dist, unsigned len, unsigned left);
 extern uint32_t compare256_rvv(const uint8_t *src0, const uint8_t *src1);
-extern void     inflate_fast_rvv(PREFIX3(stream) *strm, uint32_t start);
+
 #  ifdef DEFLATE_H_
     extern uint32_t longest_match_rvv(deflate_state *const s, Pos cur_match);
     extern uint32_t longest_match_slow_rvv(deflate_state *const s, Pos cur_match);
     extern void slide_hash_rvv(deflate_state *s);
 #  endif
+#  ifdef INFLATE_H_
+    extern void inflate_fast_rvv(PREFIX3(stream) *strm, uint32_t start);
+#  endif
 #endif
 
 #endif
diff --git a/arch/x86/x86_features.h b/arch/x86/x86_features.h
index 016914e5..42580dd9 100644
--- a/arch/x86/x86_features.h
+++ b/arch/x86/x86_features.h
@@ -29,7 +29,6 @@ void Z_INTERNAL x86_check_features(struct x86_cpu_features *features);
 #ifdef X86_SSE2
 extern uint32_t chunksize_sse2(void);
 extern uint8_t* chunkmemset_safe_sse2(uint8_t *out, unsigned dist, unsigned len, unsigned left);
-extern void     inflate_fast_sse2(PREFIX3(stream) *strm, uint32_t start);
 
 #  ifdef HAVE_BUILTIN_CTZ
     extern uint32_t compare256_sse2(const uint8_t *src0, const uint8_t *src1);
@@ -39,12 +38,17 @@ extern void     inflate_fast_sse2(PREFIX3(stream) *strm, uint32_t start);
         extern void slide_hash_sse2(deflate_state *s);
 #    endif
 #  endif
+#  ifdef INFLATE_H_
+        extern void inflate_fast_sse2(PREFIX3(stream)* strm, uint32_t start);
+#  endif
 #endif
 
 #ifdef X86_SSSE3
 extern uint32_t adler32_ssse3(uint32_t adler, const uint8_t *buf, size_t len);
 extern uint8_t* chunkmemset_safe_ssse3(uint8_t *out, unsigned dist, unsigned len, unsigned left);
-extern void     inflate_fast_ssse3(PREFIX3(stream) *strm, uint32_t start);
+#  ifdef INFLATE_H_
+    extern void inflate_fast_ssse3(PREFIX3(stream) *strm, uint32_t start);
+#  endif
 #endif
 
 #ifdef X86_SSE42
@@ -61,7 +65,6 @@ extern uint32_t adler32_avx2(uint32_t adler, const uint8_t *buf, size_t len);
 extern uint32_t adler32_fold_copy_avx2(uint32_t adler, uint8_t *dst, const uint8_t *src, size_t len);
 extern uint32_t chunksize_avx2(void);
 extern uint8_t* chunkmemset_safe_avx2(uint8_t *out, unsigned dist, unsigned len, unsigned left);
-extern void     inflate_fast_avx2(PREFIX3(stream) *strm, uint32_t start);
 
 #  ifdef HAVE_BUILTIN_CTZ
     extern uint32_t compare256_avx2(const uint8_t *src0, const uint8_t *src1);
@@ -71,6 +74,9 @@ extern void     inflate_fast_avx2(PREFIX3(stream) *strm, uint32_t start);
         extern void slide_hash_avx2(deflate_state *s);
 #    endif
 #  endif
+#  ifdef INFLATE_H_
+        extern void inflate_fast_avx2(PREFIX3(stream)* strm, uint32_t start);
+#  endif
 #endif
 #ifdef X86_AVX512
 extern uint32_t adler32_avx512(uint32_t adler, const uint8_t *buf, size_t len);
diff --git a/cpu_features.h b/cpu_features.h
index ea37a0be..4794492e 100644
--- a/cpu_features.h
+++ b/cpu_features.h
@@ -6,12 +6,6 @@
 #ifndef CPU_FEATURES_H_
 #define CPU_FEATURES_H_
 
-#ifdef ZLIB_COMPAT
-typedef struct z_stream_s z_stream;
-#else
-typedef struct zng_stream_s zng_stream;
-#endif
-
 #if defined(X86_FEATURES)
 #  include "arch/x86/x86_features.h"
 #elif defined(ARM_FEATURES)
diff --git a/functable.c b/functable.c
index 1cdaeab3..ac6bd99d 100644
--- a/functable.c
+++ b/functable.c
@@ -5,9 +5,6 @@
 
 #include "zbuild.h"
 #include "zendian.h"
-#include "crc32_braid_p.h"
-#include "deflate.h"
-#include "deflate_p.h"
 #include "functable.h"
 #include "cpu_features.h"
 
diff --git a/functable.h b/functable.h
index 433f696d..fe2f6e81 100644
--- a/functable.h
+++ b/functable.h
@@ -9,12 +9,8 @@
 #include "deflate.h"
 #include "crc32_fold_c.h"
 #include "adler32_fold_c.h"
-
-#ifdef ZLIB_COMPAT
-typedef struct z_stream_s z_stream;
-#else
-typedef struct zng_stream_s zng_stream;
-#endif
+#include "inftrees.h"
+#include "inflate.h"
 
 struct functable_s {
     void     (* force_init)         (void);