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 /inffast.c | |
parent | fb4e0599a5ddaef9eee726f786b9edef4943432b (diff) | |
download | zlib-62d6112a7981ad7c34f3b43cffdf00d4662a4f25.tar.gz zlib-62d6112a7981ad7c34f3b43cffdf00d4662a4f25.tar.bz2 zlib-62d6112a7981ad7c34f3b43cffdf00d4662a4f25.zip |
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 'inffast.c')
-rw-r--r-- | inffast.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -69,8 +69,8 @@ z_streamp strm; | |||
69 | unsigned start; /* inflate()'s starting value for strm->avail_out */ | 69 | unsigned start; /* inflate()'s starting value for strm->avail_out */ |
70 | { | 70 | { |
71 | struct inflate_state FAR *state; | 71 | struct inflate_state FAR *state; |
72 | unsigned char FAR *in; /* local strm->next_in */ | 72 | z_const unsigned char FAR *in; /* local strm->next_in */ |
73 | unsigned char FAR *last; /* while in < last, enough input available */ | 73 | z_const unsigned char FAR *last; /* while in < last, enough input available */ |
74 | unsigned char FAR *out; /* local strm->next_out */ | 74 | unsigned char FAR *out; /* local strm->next_out */ |
75 | unsigned char FAR *beg; /* inflate()'s initial strm->next_out */ | 75 | unsigned char FAR *beg; /* inflate()'s initial strm->next_out */ |
76 | unsigned char FAR *end; /* while out < end, enough space available */ | 76 | unsigned char FAR *end; /* while out < end, enough space available */ |