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.
pull/102/head
Mark Adler 12 years ago
parent 5481269e1f
commit bddc968b14
  1. 2
      zconf.h
  2. 2
      zconf.h.cmakein
  3. 2
      zconf.h.in

@ -218,7 +218,7 @@
# endif
#endif
#if ( defined(ZLIB_CONST) || defined(__cplusplus) ) && !defined(z_const)
#if defined(ZLIB_CONST) && !defined(z_const)
# define z_const const
#else
# define z_const

@ -220,7 +220,7 @@
# endif
#endif
#if ( defined(ZLIB_CONST) || defined(__cplusplus) ) && !defined(z_const)
#if defined(ZLIB_CONST) && !defined(z_const)
# define z_const const
#else
# define z_const

@ -218,7 +218,7 @@
# endif
#endif
#if ( defined(ZLIB_CONST) || defined(__cplusplus) ) && !defined(z_const)
#if defined(ZLIB_CONST) && !defined(z_const)
# define z_const const
#else
# define z_const

Loading…
Cancel
Save