Commit 6febb7d7670cc1f2b112c1f1540cd872cb208f37
2022-07-06T09:52:22
zlib: declare prototypes for new functions The `crc32_combine_gen64` missed a prototype in our define path. Add one.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49
diff --git a/deps/zlib/crc32.c b/deps/zlib/crc32.c
index a1bdce5..25cb7a0 100644
--- a/deps/zlib/crc32.c
+++ b/deps/zlib/crc32.c
@@ -114,6 +114,9 @@ local z_crc_t x2nmodp OF((z_off64_t n, unsigned k));
instruction, if one is available. This assumes that word_t is either 32 bits
or 64 bits.
*/
+
+local z_word_t byte_swap(z_word_t word);
+
local z_word_t byte_swap(word)
z_word_t word;
{
@@ -709,6 +712,9 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
#ifdef W
+local z_crc_t crc_word(z_word_t data);
+local z_word_t crc_word_big(z_word_t data);
+
/*
Return the CRC of the W bytes in the word_t data, taking the
least-significant byte of the word as the first byte of data, without any pre
@@ -1107,7 +1113,7 @@ uLong ZEXPORT crc32_combine_gen(len2)
}
/* ========================================================================= */
-uLong crc32_combine_op(crc1, crc2, op)
+uLong ZEXPORT crc32_combine_op(crc1, crc2, op)
uLong crc1;
uLong crc2;
uLong op;
diff --git a/deps/zlib/zlib.h b/deps/zlib/zlib.h
index 4a98e38..d074d83 100644
--- a/deps/zlib/zlib.h
+++ b/deps/zlib/zlib.h
@@ -1895,8 +1895,11 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file)); /* backward compatibility */
ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));
ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
+ ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t));
ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
+ ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
ZEXTERN uLong ZEXPORT crc32_combine_gen OF((z_off_t));
+ ZEXTERN uLong ZEXPORT crc32_combine_gen64 OF((z_off64_t));
#endif
#else /* Z_SOLO */