From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Sat, 22 Jan 2022 17:49:13 +0000 (-0800)
Subject: Move cpu feature variant callback typedefs to cpu_features header.
X-Git-Tag: 2.1.0-beta1~425
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a38338fad958a1a1a70f43050cefcaeef1a2371;p=thirdparty%2Fzlib-ng.git

Move cpu feature variant callback typedefs to cpu_features header.
---

diff --git a/cpu_features.h b/cpu_features.h
index ce5f0f7e..ecb09eaa 100644
--- a/cpu_features.h
+++ b/cpu_features.h
@@ -23,6 +23,8 @@
 extern void cpu_check_features();
 
 /* adler32 */
+typedef uint32_t (*adler32_func)(uint32_t adler, const unsigned char *buf, size_t len);
+
 extern uint32_t adler32_c(uint32_t adler, const unsigned char *buf, size_t len);
 #ifdef ARM_NEON_ADLER32
 extern uint32_t adler32_neon(uint32_t adler, const unsigned char *buf, size_t len);
@@ -97,6 +99,8 @@ extern uint8_t* chunkmemset_safe_power8(uint8_t *out, unsigned dist, unsigned le
 #endif
 
 /* CRC32 */
+typedef uint32_t (*crc32_func)(uint32_t crc32, const unsigned char * buf, uint64_t len);
+
 extern uint32_t crc32_byfour(uint32_t crc, const unsigned char *buf, uint64_t len);
 #ifdef ARM_ACLE_CRC_HASH
 extern uint32_t crc32_acle(uint32_t crc, const unsigned char *buf, uint64_t len);
@@ -107,6 +111,8 @@ extern uint32_t s390_crc32_vx(uint32_t crc, const unsigned char *buf, uint64_t l
 #endif
 
 /* compare256 */
+typedef uint32_t (*compare256_func)(const uint8_t *src0, const uint8_t *src1);
+
 extern uint32_t compare256_c(const uint8_t *src0, const uint8_t *src1);
 #ifdef UNALIGNED_OK
 extern uint32_t compare256_unaligned_16(const uint8_t *src0, const uint8_t *src1);
@@ -171,6 +177,8 @@ extern Pos quick_insert_string_acle(deflate_state *const s, const uint32_t str);
 #endif
 
 /* slide_hash */
+typedef void (*slide_hash_func)(deflate_state *s);
+
 #ifdef X86_SSE2
 extern void slide_hash_sse2(deflate_state *s);
 #elif defined(ARM_NEON_SLIDEHASH)
diff --git a/test/benchmarks/benchmark_adler32.cc b/test/benchmarks/benchmark_adler32.cc
index 68290888..0f63c5c3 100644
--- a/test/benchmarks/benchmark_adler32.cc
+++ b/test/benchmarks/benchmark_adler32.cc
@@ -20,8 +20,6 @@ extern "C" {
 #define MAX_RANDOM_INTS (1024 * 1024)
 #define MAX_RANDOM_INTS_SIZE (MAX_RANDOM_INTS * sizeof(uint32_t))
 
-typedef uint32_t (*adler32_func)(uint32_t adler, const unsigned char *buf, size_t len);
-
 class adler32: public benchmark::Fixture {
 private:
     uint32_t *random_ints;
diff --git a/test/benchmarks/benchmark_compare256.cc b/test/benchmarks/benchmark_compare256.cc
index a420398d..0166816d 100644
--- a/test/benchmarks/benchmark_compare256.cc
+++ b/test/benchmarks/benchmark_compare256.cc
@@ -18,8 +18,6 @@ extern "C" {
 
 #define MAX_COMPARE_SIZE (256)
 
-typedef uint32_t (*compare256_func)(const uint8_t *src0, const uint8_t *src1);
-
 class compare256: public benchmark::Fixture {
 private:
     uint8_t *str1;
diff --git a/test/benchmarks/benchmark_crc32.cc b/test/benchmarks/benchmark_crc32.cc
index 69d11a4d..68ad3f0f 100644
--- a/test/benchmarks/benchmark_crc32.cc
+++ b/test/benchmarks/benchmark_crc32.cc
@@ -20,8 +20,6 @@ extern "C" {
 #define MAX_RANDOM_INTS (1024 * 1024)
 #define MAX_RANDOM_INTS_SIZE (MAX_RANDOM_INTS * sizeof(uint32_t))
 
-typedef uint32_t (*crc32_func)(uint32_t crc32, const unsigned char * buf, uint64_t len);
-
 class crc32: public benchmark::Fixture {
 private:
     uint32_t *random_ints;
diff --git a/test/benchmarks/benchmark_slidehash.cc b/test/benchmarks/benchmark_slidehash.cc
index 174ea093..7e655736 100644
--- a/test/benchmarks/benchmark_slidehash.cc
+++ b/test/benchmarks/benchmark_slidehash.cc
@@ -19,8 +19,6 @@ extern "C" {
 
 #define MAX_RANDOM_INTS 32768
 
-typedef void (*slide_hash_func)(deflate_state *s);
-
 class slide_hash: public benchmark::Fixture {
 private:
     uint16_t *l0;