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

diff --git a/configure b/configure
index 3712476f45e652b88312170fa47cf43765014276..76350219002669b85566061b89f4450a4e48e0ca 100755 (executable)
--- 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 7d54668d36516f8288bf97c7d804e0c14b201366..2282fc22608e23cd4ffe0c86f363815f0e0a269e 100644 (file)
--- 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 ae2a30939825d67de1502e9bc5e20cbc89fde74e..a420c50b928df1fa3a9f1923c6ee7cac926c8156 100644 (file)
--- 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 0cd234ac995bbc13535e50109bb383c50b9052ec..2e6d8cc1cca7040761a45cd9b396f1f11c9bf686 100644 (file)
--- 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 e0b93c295c4fd6e84af48dcc08a457e7d522762a..fee1137c6271ecada14516463abe56feaec6b2a4 100644 (file)
--- a/zlib.h
+++ b/zlib.h
@@ -36,6 +36,7 @@
 
 #include <stdint.h>
 #include <stdarg.h>
+
 #include "zconf.h"
 
 #ifndef ZCONF_H