]> git.ipfire.org Git - thirdparty/zlib-ng.git/commitdiff
Use cpu_check_features in inflate and deflate.
authorNathan Moinvaziri <nathan@nathanm.com>
Sat, 22 Jan 2022 17:28:37 +0000 (09:28 -0800)
committerHans Kristian Rosbach <hk-github@circlestorm.org>
Sun, 23 Jan 2022 15:39:48 +0000 (16:39 +0100)
deflate.c
inflate.c

index 5919cdb36406d6b71a5f380ca584e6e3903a4e1f..50c5531f1bb7c19781914a14adca36537898726d 100644 (file)
--- a/deflate.c
+++ b/deflate.c
@@ -194,11 +194,7 @@ int32_t Z_EXPORT PREFIX(deflateInit2_)(PREFIX3(stream) *strm, int32_t level, int
     int wrap = 1;
     static const char my_version[] = PREFIX2(VERSION);
 
-#if defined(X86_FEATURES)
-    x86_check_features();
-#elif defined(ARM_FEATURES)
-    arm_check_features();
-#endif
+    cpu_check_features();
 
     if (version == NULL || version[0] != my_version[0] || stream_size != sizeof(PREFIX3(stream))) {
         return Z_VERSION_ERROR;
index 1e8806a490d345564475c074ad566fe6d14e43e4..06b37bf40c98e57b3b3017a7b13fd7711c1016f3 100644 (file)
--- a/inflate.c
+++ b/inflate.c
@@ -105,11 +105,7 @@ int32_t Z_EXPORT PREFIX(inflateInit2_)(PREFIX3(stream) *strm, int32_t windowBits
     int32_t ret;
     struct inflate_state *state;
 
-#if defined(X86_FEATURES)
-    x86_check_features();
-#elif defined(ARM_FEATURES)
-    arm_check_features();
-#endif
+    cpu_check_features();
 
     if (version == NULL || version[0] != PREFIX2(VERSION)[0] || stream_size != (int)(sizeof(PREFIX3(stream))))
         return Z_VERSION_ERROR;