Move include files out of match_tpl.h, to simplify dependency handling and

avoid attempting to parse the includes more times than needed.

diff --git a/arch/arm/compare256_neon.c b/arch/arm/compare256_neon.c
index 4d6ba5334b8767e6c2df70f640fc8d1f48e97758..87d14c89c09bc1fe5dcff06ae042aa737e597bad 100644 (file)
--- a/arch/arm/compare256_neon.c
+++ b/arch/arm/compare256_neon.c
@@ -4,7 +4,8 @@
  */
 
 #include "zbuild.h"
-
+#include "zutil_p.h"
+#include "deflate.h"
 #include "fallback_builtins.h"
 
 #if defined(ARM_NEON) && defined(HAVE_BUILTIN_CTZLL)

diff --git a/arch/power/compare256_power9.c b/arch/power/compare256_power9.c
index f936cc9829f4287beee08c1ad201b812601b16cc..c8be498e4f60b2f3b84c90b5a1d4f9f7de923e20 100644 (file)
--- a/arch/power/compare256_power9.c
+++ b/arch/power/compare256_power9.c
@@ -6,6 +6,8 @@
 #ifdef POWER9
 #include <altivec.h>
 #include "zbuild.h"
+#include "zutil_p.h"
+#include "deflate.h"
 #include "zendian.h"
 
 /* Older versions of GCC misimplemented semantics for these bit counting builtins.

diff --git a/arch/riscv/compare256_rvv.c b/arch/riscv/compare256_rvv.c
index cf0de0deb776282ad56ab4fb454bb95477abddad..3d6c3e3aa5b1e923bb864676ab3fb22ba14eba31 100644 (file)
--- a/arch/riscv/compare256_rvv.c
+++ b/arch/riscv/compare256_rvv.c
@@ -7,6 +7,8 @@
 #ifdef RISCV_RVV
 
 #include "zbuild.h"
+#include "zutil_p.h"
+#include "deflate.h"
 #include "fallback_builtins.h"
 
 #include <riscv_vector.h>

diff --git a/arch/x86/compare256_avx2.c b/arch/x86/compare256_avx2.c
index a706a30fafcbc3187e6baf923dd915f235aee2b6..d2c835e4ee8ec4c99111134b7008bf2a0722f6e1 100644 (file)
--- a/arch/x86/compare256_avx2.c
+++ b/arch/x86/compare256_avx2.c
@@ -4,7 +4,8 @@
  */
 
 #include "zbuild.h"
-
+#include "zutil_p.h"
+#include "deflate.h"
 #include "fallback_builtins.h"
 
 #if defined(X86_AVX2) && defined(HAVE_BUILTIN_CTZ)

diff --git a/arch/x86/compare256_sse2.c b/arch/x86/compare256_sse2.c
index 015d5398b4bec0a74236c25c6ce8a945a9215380..216bb3a705c4a4329e96d3a4912163195737595a 100644 (file)
--- a/arch/x86/compare256_sse2.c
+++ b/arch/x86/compare256_sse2.c
@@ -4,7 +4,8 @@
  */
 
 #include "zbuild.h"
-
+#include "zutil_p.h"
+#include "deflate.h"
 #include "fallback_builtins.h"
 
 #if defined(X86_SSE2) && defined(HAVE_BUILTIN_CTZ)

diff --git a/compare256.c b/compare256.c
index 82551cdd579ece16e4995a4c9272f06dc57e93b4..0c12cb3a4ec4be52b447c7f13ee5fcae584cc90a 100644 (file)
--- a/compare256.c
+++ b/compare256.c
@@ -5,6 +5,7 @@
 
 #include "zbuild.h"
 #include "zutil_p.h"
+#include "deflate.h"
 #include "fallback_builtins.h"
 
 /* ALIGNED, byte comparison */

diff --git a/match_tpl.h b/match_tpl.h
index d076798520eeda01d41aa859274ced6e36049325..4856d64db2956bad3aa08fe95c42f54e2b9cc86f 100644 (file)
--- a/match_tpl.h
+++ b/match_tpl.h
@@ -8,11 +8,6 @@
  *  https://github.com/gildor2/fast_zlib
  */
 
-#include "zbuild.h"
-#include "zutil_p.h"
-#include "deflate.h"
-#include "functable.h"
-
 #ifndef MATCH_TPL_H
 #define MATCH_TPL_H