From a877c415af8ffb4921ed659c11c6e51ceceaedb1 Mon Sep 17 00:00:00 2001 From: Nathan Moinvaziri Date: Wed, 26 Jan 2022 17:58:52 -0800 Subject: [PATCH] Only define CPU variants that require deflate_state when deflate.h has previously been included. This allows us to include cpu_features.h without including zlib.h or name mangling. --- cpu_features.h | 3 ++- test/benchmarks/benchmark_slidehash.cc | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cpu_features.h b/cpu_features.h index 6ae66a25..89d4a5d9 100644 --- a/cpu_features.h +++ b/cpu_features.h @@ -6,7 +6,6 @@ #ifndef CPU_FEATURES #define CPU_FEATURES -#include "deflate.h" #include "crc32_fold.h" #if defined(X86_FEATURES) @@ -128,6 +127,7 @@ extern uint32_t compare256_unaligned_avx2(const uint8_t *src0, const uint8_t *sr #endif #endif +#ifdef DEFLATE_H_ /* insert_string */ extern void insert_string_c(deflate_state *const s, const uint32_t str, uint32_t count); #ifdef X86_SSE42_CRC_HASH @@ -201,5 +201,6 @@ extern uint32_t update_hash_sse4(deflate_state *const s, uint32_t h, uint32_t va #elif defined(ARM_ACLE_CRC_HASH) extern uint32_t update_hash_acle(deflate_state *const s, uint32_t h, uint32_t val); #endif +#endif #endif diff --git a/test/benchmarks/benchmark_slidehash.cc b/test/benchmarks/benchmark_slidehash.cc index 7e655736..195e7475 100644 --- a/test/benchmarks/benchmark_slidehash.cc +++ b/test/benchmarks/benchmark_slidehash.cc @@ -11,8 +11,8 @@ extern "C" { # include "zbuild.h" # include "zutil.h" # include "zutil_p.h" -# include "cpu_features.h" # include "deflate.h" +# include "cpu_features.h" } #include -- 2.47.2