mchapman/zlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Do not force Z_CONST for C++.

Browse Source 
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.
This commit is contained in:
Mark Adler
2013-04-14 10:31:31 -07:00
parent 5481269e1f
commit bddc968b14
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zconf.h
View File

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

2
zconf.h.cmakein
View File

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

2
zconf.h.in
View File

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