diff options
| author | AlexisWilke <alexis@m2osw.com> | 2024-10-13 08:46:47 -0700 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2024-10-13 17:40:35 -0700 |
| commit | 6d3a66a11a9d98c80d5b6a36d489263a389c6b90 (patch) | |
| tree | 56d4ccf7ed87cb0f0d94271f2775d053f28ab824 | |
| parent | 64191119d810730c0da919836208486f571e4940 (diff) | |
| download | zlib-6d3a66a11a9d98c80d5b6a36d489263a389c6b90.tar.gz zlib-6d3a66a11a9d98c80d5b6a36d489263a389c6b90.tar.bz2 zlib-6d3a66a11a9d98c80d5b6a36d489263a389c6b90.zip | |
Avoid attempting to redefine z_const in zconf.h.
| -rw-r--r-- | zconf.h | 10 | ||||
| -rw-r--r-- | zconf.h.cmakein | 10 | ||||
| -rw-r--r-- | zconf.h.in | 10 |
3 files changed, 18 insertions, 12 deletions
| @@ -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 |
diff --git a/zconf.h.cmakein b/zconf.h.cmakein index 7a35e8f..f43a904 100644 --- a/zconf.h.cmakein +++ b/zconf.h.cmakein | |||
| @@ -237,10 +237,12 @@ | |||
| 237 | # endif | 237 | # endif |
| 238 | #endif | 238 | #endif |
| 239 | 239 | ||
| 240 | #if defined(ZLIB_CONST) && !defined(z_const) | 240 | #ifndef z_const |
| 241 | # define z_const const | 241 | # ifdef ZLIB_CONST |
| 242 | #else | 242 | # define z_const const |
| 243 | # define z_const | 243 | # else |
| 244 | # define z_const | ||
| 245 | # endif | ||
| 244 | #endif | 246 | #endif |
| 245 | 247 | ||
| 246 | #ifdef Z_SOLO | 248 | #ifdef Z_SOLO |
| @@ -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 |