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.1.0-beta1~216
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff9162c1a0da8d60ae664e5930b256de99ad83b3;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 26529dbb5..ffee40054 100755
--- a/configure
+++ b/configure
@@ -874,6 +874,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 16fdcfa0f..7f8983bf4 100644
--- a/zconf-ng.h.in
+++ b/zconf-ng.h.in
@@ -116,7 +116,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 eea3c4ac7..c82a8ad00 100644
--- a/zconf.h.in
+++ b/zconf.h.in
@@ -127,6 +127,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
@@ -136,7 +138,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.in b/zlib-ng.h.in
index 38a5225f7..a1536b76d 100644
--- a/zlib-ng.h.in
+++ b/zlib-ng.h.in
@@ -34,9 +34,10 @@
 #endif
 
 #ifndef RC_INVOKED
-#include "zconf-ng.h"
-
 #include <stdint.h>
+#include <stdarg.h>
+
+#include "zconf-ng.h"
 
 #ifndef ZCONFNG_H
 #  error Missing zconf-ng.h add binary output directory to include directories
diff --git a/zlib.h.in b/zlib.h.in
index 7e77a5bb7..09ea336ff 100644
--- a/zlib.h.in
+++ b/zlib.h.in
@@ -35,11 +35,11 @@
 #endif
 
 #ifndef RC_INVOKED
-#include "zconf.h"
-
 #include <stdint.h>
 #include <stdarg.h>
 
+#include "zconf.h"
+
 #ifndef ZCONF_H
 #  error Missing zconf.h add binary output directory to include directories
 #endif