From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Mon, 20 Dec 2021 16:23:44 +0000 (-0800)
Subject: Fixed crc32_combine_gen declaration warning in zlib-ng API.
X-Git-Tag: 2.1.0-beta1~474
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63bc287e4db74a62940876143c3c6f9058f401de;p=thirdparty%2Fzlib-ng.git

Fixed crc32_combine_gen declaration warning in zlib-ng API.
---

diff --git a/crc32_comb.c b/crc32_comb.c
index fa11b9b22..7a6b68a90 100644
--- a/crc32_comb.c
+++ b/crc32_comb.c
@@ -18,7 +18,7 @@
 
 /* Local functions for crc concatenation */
 static uint32_t crc32_combine_(uint32_t crc1, uint32_t crc2, z_off64_t len2);
-static void crc32_combine_gen_(uint32_t *op, z_off64_t len2);
+static void crc32_combine_gen_(uint32_t op[GF2_DIM], z_off64_t len2);
 
 /* ========================================================================= */
 static uint32_t crc32_combine_(uint32_t crc1, uint32_t crc2, z_off64_t len2) {
@@ -49,7 +49,7 @@ uint32_t Z_EXPORT PREFIX4(crc32_combine)(uint32_t crc1, uint32_t crc2, z_off64_t
 
 /* ========================================================================= */
 
-static void crc32_combine_gen_(uint32_t *op, z_off64_t len2) {
+static void crc32_combine_gen_(uint32_t op[GF2_DIM], z_off64_t len2) {
     uint32_t row;
     int j;
     unsigned i;
@@ -96,11 +96,14 @@ static void crc32_combine_gen_(uint32_t *op, z_off64_t len2) {
 void Z_EXPORT PREFIX(crc32_combine_gen)(uint32_t *op, z_off_t len2) {
     crc32_combine_gen_(op, len2);
 }
-#endif
-
 void Z_EXPORT PREFIX4(crc32_combine_gen)(uint32_t *op, z_off64_t len2) {
     crc32_combine_gen_(op, len2);
 }
+#else
+void Z_EXPORT PREFIX4(crc32_combine_gen)(uint32_t op[GF2_DIM], z_off64_t len2) {
+    crc32_combine_gen_(op, len2);
+}
+#endif
 
 /* ========================================================================= */
 uint32_t Z_EXPORT PREFIX(crc32_combine_op)(uint32_t crc1, uint32_t crc2, const uint32_t *op) {