diff options
| author | Mark Adler <madler@alumni.caltech.edu> | 2012-08-12 18:08:52 -0700 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2012-08-13 00:02:40 -0700 |
| commit | 62d6112a7981ad7c34f3b43cffdf00d4662a4f25 (patch) | |
| tree | aed93070f7e1be31868dce1d62a1de6ffc1360f9 /zutil.h | |
| parent | fb4e0599a5ddaef9eee726f786b9edef4943432b (diff) | |
| download | zlib-62d6112a7981ad7c34f3b43cffdf00d4662a4f25.tar.gz | |
Clean up the usage of z_const and respect const usage within zlib.
This patch allows zlib to compile cleanly with the -Wcast-qual gcc
warning enabled, but only if ZLIB_CONST is defined, which adds
const to next_in and msg in z_stream and in the in_func prototype.
A --const option is added to ./configure which adds -DZLIB_CONST
to the compile flags, and adds -Wcast-qual to the compile flags
when ZLIBGCCWARN is set in the environment.
Diffstat (limited to 'zutil.h')
| -rw-r--r-- | zutil.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -44,13 +44,13 @@ typedef unsigned short ush; typedef ush FAR ushf; typedef unsigned long ulg; -extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ +extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ /* (size given to avoid silly warnings with Visual C++) */ #define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)] #define ERR_RETURN(strm,err) \ - return (strm->msg = (char*)ERR_MSG(err), (err)) + return (strm->msg = ERR_MSG(err), (err)) /* To be used only when the state is known to be valid */ /* common constants */ |