Bug 1202099 - Fix a clang 3.7 build warning (treated as error) in zlib

This is the following commit from upstream: e54e1299404101a5a9d0cf5e45512b543967f958
This commit is contained in:
Ehsan Akhgari 2015-09-08 09:46:26 -04:00
parent 42b3656093
commit 4fe96ebd42

View File

@ -1504,9 +1504,10 @@ z_streamp strm;
{
struct inflate_state FAR *state;
if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16;
if (strm == Z_NULL || strm->state == Z_NULL)
return (long)(((unsigned long)0 - 1) << 16);
state = (struct inflate_state FAR *)strm->state;
return ((long)(state->back) << 16) +
return (long)(((unsigned long)((long)state->back)) << 16) +
(state->mode == COPY ? state->length :
(state->mode == MATCH ? state->was - state->length : 0));
}