diff options
| author | Mark Adler <madler@alumni.caltech.edu> | 2013-04-14 10:31:31 -0700 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2013-04-28 15:57:11 -0700 |
| commit | bddc968b1432f045e4630f72273f2049b211c333 (patch) | |
| tree | b3fe1a7b0152dc3501e088b38edaa0bb6d307ba7 | |
| parent | 5481269e1fa6d99a1799762c657f1ba7155ad922 (diff) | |
| download | zlib-bddc968b1432f045e4630f72273f2049b211c333.tar.gz zlib-bddc968b1432f045e4630f72273f2049b211c333.tar.bz2 zlib-bddc968b1432f045e4630f72273f2049b211c333.zip | |
Do not force Z_CONST for C++.
Forcing Z_CONST resulted in an issue when compiling Firefox. Now
if someone wants to compile zlib as C++ code (which it isn't), now
they will need to #define Z_CONST themselves.
| -rw-r--r-- | zconf.h | 2 | ||||
| -rw-r--r-- | zconf.h.cmakein | 2 | ||||
| -rw-r--r-- | zconf.h.in | 2 |
3 files changed, 3 insertions, 3 deletions
| @@ -218,7 +218,7 @@ | |||
| 218 | # endif | 218 | # endif |
| 219 | #endif | 219 | #endif |
| 220 | 220 | ||
| 221 | #if ( defined(ZLIB_CONST) || defined(__cplusplus) ) && !defined(z_const) | 221 | #if defined(ZLIB_CONST) && !defined(z_const) |
| 222 | # define z_const const | 222 | # define z_const const |
| 223 | #else | 223 | #else |
| 224 | # define z_const | 224 | # define z_const |
diff --git a/zconf.h.cmakein b/zconf.h.cmakein index 10e445f..043019c 100644 --- a/zconf.h.cmakein +++ b/zconf.h.cmakein | |||
| @@ -220,7 +220,7 @@ | |||
| 220 | # endif | 220 | # endif |
| 221 | #endif | 221 | #endif |
| 222 | 222 | ||
| 223 | #if ( defined(ZLIB_CONST) || defined(__cplusplus) ) && !defined(z_const) | 223 | #if defined(ZLIB_CONST) && !defined(z_const) |
| 224 | # define z_const const | 224 | # define z_const const |
| 225 | #else | 225 | #else |
| 226 | # define z_const | 226 | # define z_const |
| @@ -218,7 +218,7 @@ | |||
| 218 | # endif | 218 | # endif |
| 219 | #endif | 219 | #endif |
| 220 | 220 | ||
| 221 | #if ( defined(ZLIB_CONST) || defined(__cplusplus) ) && !defined(z_const) | 221 | #if defined(ZLIB_CONST) && !defined(z_const) |
| 222 | # define z_const const | 222 | # define z_const const |
| 223 | #else | 223 | #else |
| 224 | # define z_const | 224 | # define z_const |