From dada8e6dc0f0a4989ec4861c7b892be3e1d51440 Mon Sep 17 00:00:00 2001 From: Hans Kristian Rosbach Date: Thu, 4 Jan 2024 16:43:43 +0100 Subject: [PATCH] Move include files out of match_tpl.h, to simplify dependency handling and avoid attempting to parse the includes more times than needed. --- arch/arm/compare256_neon.c | 3 ++- arch/power/compare256_power9.c | 2 ++ arch/riscv/compare256_rvv.c | 2 ++ arch/x86/compare256_avx2.c | 3 ++- arch/x86/compare256_sse2.c | 3 ++- compare256.c | 1 + match_tpl.h | 5 ----- 7 files changed, 11 insertions(+), 8 deletions(-) diff --git a/arch/arm/compare256_neon.c b/arch/arm/compare256_neon.c index 4d6ba533..87d14c89 100644 --- 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 f936cc98..c8be498e 100644 --- a/arch/power/compare256_power9.c +++ b/arch/power/compare256_power9.c @@ -6,6 +6,8 @@ #ifdef POWER9 #include #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 cf0de0de..3d6c3e3a 100644 --- 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 diff --git a/arch/x86/compare256_avx2.c b/arch/x86/compare256_avx2.c index a706a30f..d2c835e4 100644 --- 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 015d5398..216bb3a7 100644 --- 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 82551cdd..0c12cb3a 100644 --- 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 d0767985..4856d64d 100644 --- 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 -- 2.47.3