From: Mika Lindqvist <postmaster@raasu.org>
Date: Fri, 17 Jun 2022 10:06:56 +0000 (+0300)
Subject: In compatibility mode, always define z_crc_t as uint32_t for backwards compatibility.
X-Git-Tag: 2.0.7~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=137eb946cb9593c1aa78ed9d0b91ee6d3cb6977f;p=thirdparty%2Fzlib-ng.git

In compatibility mode, always define z_crc_t as uint32_t for backwards compatibility.
---

diff --git a/configure b/configure
index 3712476f..76350219 100755
--- a/configure
+++ b/configure
@@ -878,6 +878,7 @@ echo >> configure.log
 
 # Check for ANSI C compliant compiler
 cat > $test.c <<EOF
+#include <stdint.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include "zconf${SUFFIX}.h"
diff --git a/zconf-ng.h.in b/zconf-ng.h.in
index 7d54668d..2282fc22 100644
--- a/zconf-ng.h.in
+++ b/zconf-ng.h.in
@@ -119,7 +119,6 @@ typedef PTRDIFF_TYPE ptrdiff_t;
 #endif
 
 #include <sys/types.h>      /* for off_t */
-#include <stdarg.h>         /* for va_list */
 
 #include <stddef.h>         /* for wchar_t and NULL */
 
diff --git a/zconf.h.in b/zconf.h.in
index ae2a3093..a420c50b 100644
--- a/zconf.h.in
+++ b/zconf.h.in
@@ -130,6 +130,8 @@ typedef void const *voidpc;
 typedef void       *voidpf;
 typedef void       *voidp;
 
+typedef uint32_t z_crc_t;
+
 #ifdef HAVE_UNISTD_H    /* may be set to #if 1 by configure/cmake/etc */
 #  define Z_HAVE_UNISTD_H
 #endif
@@ -139,7 +141,6 @@ typedef PTRDIFF_TYPE ptrdiff_t;
 #endif
 
 #include <sys/types.h>      /* for off_t */
-#include <stdarg.h>         /* for va_list */
 
 #include <stddef.h>         /* for wchar_t and NULL */
 
diff --git a/zlib-ng.h b/zlib-ng.h
index 0cd234ac..2e6d8cc1 100644
--- a/zlib-ng.h
+++ b/zlib-ng.h
@@ -34,6 +34,8 @@
 #endif
 
 #include <stdint.h>
+#include <stdarg.h>
+
 #include "zconf-ng.h"
 
 #ifndef ZCONFNG_H
diff --git a/zlib.h b/zlib.h
index e0b93c29..fee1137c 100644
--- a/zlib.h
+++ b/zlib.h
@@ -36,6 +36,7 @@
 
 #include <stdint.h>
 #include <stdarg.h>
+
 #include "zconf.h"
 
 #ifndef ZCONF_H