From c4e8a3222648fcf22ca207f1815ebbf7cd144eeb Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 19 Sep 2024 06:14:26 +0200 Subject: Adding upstream version 4.4.0. Signed-off-by: Daniel Baumann --- wsutil/adler32.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'wsutil/adler32.c') diff --git a/wsutil/adler32.c b/wsutil/adler32.c index 2830eab4..bdd99395 100644 --- a/wsutil/adler32.c +++ b/wsutil/adler32.c @@ -12,6 +12,13 @@ #include +#ifdef HAVE_ZLIBNG +#include +#else +#ifdef HAVE_ZLIB +#include +#endif /* HAVE_ZLIB */ +#endif #include #define BASE 65521 /* largest prime smaller than 65536 */ @@ -19,6 +26,13 @@ /*--- update_adler32 --------------------------------------------------------*/ uint32_t update_adler32(uint32_t adler, const uint8_t *buf, size_t len) { +#if defined (HAVE_ZLIB) || defined (HAVE_ZLIBNG) +#ifdef HAVE_ZLIBNG + return (uint32_t)zng_adler32(adler, buf, len); +#else + return (uint32_t)adler32(adler, buf, len); +#endif +#endif uint32_t s1 = adler & 0xffff; uint32_t s2 = (adler >> 16) & 0xffff; size_t n; @@ -28,6 +42,7 @@ uint32_t update_adler32(uint32_t adler, const uint8_t *buf, size_t len) s2 = (s2 + s1) % BASE; } return (s2 << 16) + s1; + } /*--- adler32 ---------------------------------------------------------------*/ -- cgit v1.2.3