aboutsummaryrefslogtreecommitdiff
path: root/zconf.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--zconf.h6
-rw-r--r--zconf.h.cmakein6
-rw-r--r--zconf.h.in6
3 files changed, 18 insertions, 0 deletions
diff --git a/zconf.h b/zconf.h
index df7ff61..fd10c6a 100644
--- a/zconf.h
+++ b/zconf.h
@@ -214,6 +214,12 @@
214# endif 214# endif
215#endif 215#endif
216 216
217#if defined(ZLIB_CONST) && !defined(z_const)
218# define z_const const
219#else
220# define z_const
221#endif
222
217/* Some Mac compilers merge all .h files incorrectly: */ 223/* Some Mac compilers merge all .h files incorrectly: */
218#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__) 224#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
219# define NO_DUMMY_DECL 225# define NO_DUMMY_DECL
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 @@
216# endif 216# endif
217#endif 217#endif
218 218
219#if defined(ZLIB_CONST) && !defined(z_const)
220# define z_const const
221#else
222# define z_const
223#endif
224
219/* Some Mac compilers merge all .h files incorrectly: */ 225/* Some Mac compilers merge all .h files incorrectly: */
220#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__) 226#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
221# define NO_DUMMY_DECL 227# define NO_DUMMY_DECL
diff --git a/zconf.h.in b/zconf.h.in
index df7ff61..fd10c6a 100644
--- a/zconf.h.in
+++ b/zconf.h.in
@@ -214,6 +214,12 @@
214# endif 214# endif
215#endif 215#endif
216 216
217#if defined(ZLIB_CONST) && !defined(z_const)
218# define z_const const
219#else
220# define z_const
221#endif
222
217/* Some Mac compilers merge all .h files incorrectly: */ 223/* Some Mac compilers merge all .h files incorrectly: */
218#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__) 224#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
219# define NO_DUMMY_DECL 225# define NO_DUMMY_DECL