summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMika Lindqvist <postmaster@raasu.org>2022-06-17 13:06:56 +0300
committerHans Kristian Rosbach <hk-github@circlestorm.org>2023-03-17 21:27:56 +0100
commit137eb946cb9593c1aa78ed9d0b91ee6d3cb6977f (patch)
treed4e453f78f3d66a9080f5e045f09f0792719c1a0
parent87495d42a509b461c6cd3aa750cf562b931c0692 (diff)
In compatibility mode, always define z_crc_t as uint32_t for backwards compatibility.
-rwxr-xr-xconfigure1
-rw-r--r--zconf-ng.h.in1
-rw-r--r--zconf.h.in3
-rw-r--r--zlib-ng.h2
-rw-r--r--zlib.h1
5 files changed, 6 insertions, 2 deletions
diff --git a/configure b/configure
index 3712476..7635021 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 7d54668..2282fc2 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 ae2a309..a420c50 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 0cd234a..2e6d8cc 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 e0b93c2..fee1137 100644
--- a/zlib.h
+++ b/zlib.h
@@ -36,6 +36,7 @@
#include <stdint.h>
#include <stdarg.h>
+
#include "zconf.h"
#ifndef ZCONF_H