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

diff --git a/configure b/configure
index 26529dbb5cb51e5fa5030dab53044f1ba1aced3d..ffee40054849a95a3604f286424b47c9e0bb9a91 100755 (executable)
--- 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 16fdcfa0fc264a83799d9207735f4821056402c3..7f8983bf461d49e2bb9172693f350874f334cd6c 100644 (file)
--- 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 eea3c4ac7e151e995edaaa96ea5694f9417ed191..c82a8ad009b60998a7b418b1fb888066ba9c8dd6 100644 (file)
--- 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 38a5225f7bb40b70a8a8a4ac27db57a714779704..a1536b76d20441078ad25bae216acef36fdcf74b 100644 (file)
--- 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 7e77a5bb7865460a525902bd03ad8a7cb0da8edf..09ea336ff3e56757d731d0a0f1d13d7538673d25 100644 (file)
--- 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