From bddc968b1432f045e4630f72273f2049b211c333 Mon Sep 17 00:00:00 2001 From: Mark Adler Date: Sun, 14 Apr 2013 10:31:31 -0700 Subject: 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.cmakein | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '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 -- cgit v1.2.1