提交 bddc968b 编写于 作者: M Mark Adler

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.
上级 5481269e
...@@ -218,7 +218,7 @@ ...@@ -218,7 +218,7 @@
# endif # endif
#endif #endif
#if ( defined(ZLIB_CONST) || defined(__cplusplus) ) && !defined(z_const) #if defined(ZLIB_CONST) && !defined(z_const)
# define z_const const # define z_const const
#else #else
# define z_const # define z_const
......
...@@ -220,7 +220,7 @@ ...@@ -220,7 +220,7 @@
# endif # endif
#endif #endif
#if ( defined(ZLIB_CONST) || defined(__cplusplus) ) && !defined(z_const) #if defined(ZLIB_CONST) && !defined(z_const)
# define z_const const # define z_const const
#else #else
# define z_const # define z_const
......
...@@ -218,7 +218,7 @@ ...@@ -218,7 +218,7 @@
# endif # endif
#endif #endif
#if ( defined(ZLIB_CONST) || defined(__cplusplus) ) && !defined(z_const) #if defined(ZLIB_CONST) && !defined(z_const)
# define z_const const # define z_const const
#else #else
# define z_const # define z_const
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册