From: Mark Adler <madler@alumni.caltech.edu>
Date: Sun, 14 Apr 2013 17:31:31 +0000 (-0700)
Subject: Do not force Z_CONST for C++.
X-Git-Tag: v1.2.8~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bddc968b1432f045e4630f72273f2049b211c333;p=thirdparty%2Fzlib-ng.git

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.
---

diff --git a/zconf.h b/zconf.h
index 7a9d8f21b..9987a7755 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
diff --git a/zconf.h.cmakein b/zconf.h.cmakein
index 10e445f21..043019cda 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
diff --git a/zconf.h.in b/zconf.h.in
index 7a9d8f21b..9987a7755 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