commit bddc968b1432f045e4630f72273f2049b211c333
author Mark Adler <madler@alumni.caltech.edu> Sun Apr 14 10:31:31 2013 -0700
committer Mark Adler <madler@alumni.caltech.edu> Sun Apr 28 15:57:11 2013 -0700
tree b3fe1a7b0152dc3501e088b38edaa0bb6d307ba7
parent 5481269e1fa6d99a1799762c657f1ba7155ad922

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.

zconf.h

diff --git a/zconf.h b/zconf.h
index 7a9d8f2..9987a77 100644
--- a/zconf.h
+++ b/zconf.h
@@ -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

zconf.h.cmakein

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 @@
 #  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

zconf.h.in

diff --git a/zconf.h.in b/zconf.h.in
index 7a9d8f2..9987a77 100644
--- a/zconf.h.in
+++ b/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