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 05c23a889d67dbda9ff6d89321a72b9f1505b947..722fb1c2a1f1b5d8d6a5c8a2112177652ab214c4 100644 (file)
--- 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 9e523da91544ec469d7706db5d9d3834abd00e9d..928f6bc8106daf18d277ec34f7246dae6fdc17a6 100644 (file)
--- 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 43287d365b810cbb5ac596d449791311762316ea..19af195b2050ef34ecfbc610620bdef9cb56d1cc 100644 (file)
--- 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 1aada419123d79e8c71b6425d684c95c4bbf355f..b6f48cc1d8352157a4c0b22d80a5a45b4a032403 100644 (file)
--- 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 016914e5464c0c58ffa8b454f9c52e3d92ed732f..42580dd9495a3aeecce78c432ee9dbe7e70a8836 100644 (file)
--- 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 ea37a0be1eddec8435c2302fb8e5da2eb822789e..4794492ef7d292d63ae2aa5c9c1f925f41fb4503 100644 (file)
--- 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 1cdaeab371222f149b35f19cd8ceff5ccd42d80c..ac6bd99d733df21e87c061f00d6859f59b2db1aa 100644 (file)
--- 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 433f696d3cd70dd028790a63667d0841ed74da0f..fe2f6e81dd2179aaa93d4230bf742b49f31a1477 100644 (file)
--- 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);