aboutsummaryrefslogtreecommitdiff
path: root/zconf.h.in
diff options
context:
space:
mode:
authorAlexisWilke <alexis@m2osw.com>2024-10-13 08:46:47 -0700
committerMark Adler <madler@alumni.caltech.edu>2024-10-13 17:40:35 -0700
commit6d3a66a11a9d98c80d5b6a36d489263a389c6b90 (patch)
tree56d4ccf7ed87cb0f0d94271f2775d053f28ab824 /zconf.h.in
parent64191119d810730c0da919836208486f571e4940 (diff)
downloadzlib-6d3a66a11a9d98c80d5b6a36d489263a389c6b90.tar.gz
zlib-6d3a66a11a9d98c80d5b6a36d489263a389c6b90.tar.bz2
zlib-6d3a66a11a9d98c80d5b6a36d489263a389c6b90.zip
Avoid attempting to redefine z_const in zconf.h.
Diffstat (limited to 'zconf.h.in')
-rw-r--r--zconf.h.in10
1 files changed, 6 insertions, 4 deletions
diff --git a/zconf.h.in b/zconf.h.in
index 4a52aed..d6c159a 100644
--- a/zconf.h.in
+++ b/zconf.h.in
@@ -235,10 +235,12 @@
235# endif 235# endif
236#endif 236#endif
237 237
238#if defined(ZLIB_CONST) && !defined(z_const) 238#ifndef z_const
239# define z_const const 239# ifdef ZLIB_CONST
240#else 240# define z_const const
241# define z_const 241# else
242# define z_const
243# endif
242#endif 244#endif
243 245
244#ifdef Z_SOLO 246#ifdef Z_SOLO