summaryrefslogtreecommitdiff
path: root/zconf.h.cmakein
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2011-10-18 23:05:37 -0700
committerMark Adler <madler@alumni.caltech.edu>2011-10-18 23:05:37 -0700
commit5ab9f47745fe9353291b217f705086b6070575d5 (patch)
tree0a6c69f912f56cdbd36328cc67e4637bde6208b9 /zconf.h.cmakein
parent5b48d061c8c46bc19e6ad965157440880e5708b9 (diff)
downloadzlib-5ab9f47745fe9353291b217f705086b6070575d5.tar.gz
Add #define ZLIB_CONST option to use const in the z_stream interface.
This permits compilers to check for the proper treatment of next_in and msg in the z_stream structure. This is an option instead of the default in order to preserve backward compatibility. Some applications make use of the z_stream structure outside of zlib, and perform operations such as free(strm->next_in), which would not be permitted when next_in is const. The #define ZLIB_CONST needs to precede the #include "zlib.h">, in order to make next_in and msg const pointers in the z_stream type.
Diffstat (limited to 'zconf.h.cmakein')
-rw-r--r--zconf.h.cmakein6
1 files changed, 6 insertions, 0 deletions
diff --git a/zconf.h.cmakein b/zconf.h.cmakein
index 8450547..0b880ad 100644
--- a/zconf.h.cmakein
+++ b/zconf.h.cmakein
@@ -216,6 +216,12 @@
# endif
#endif
+#if defined(ZLIB_CONST) && !defined(z_const)
+# define z_const const
+#else
+# define z_const
+#endif
+
/* Some Mac compilers merge all .h files incorrectly: */
#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
# define NO_DUMMY_DECL