diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-08-05 11:35:53 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-08-05 11:35:53 +0200 |
| commit | 6bd66b1728eeddb058066edda740aaeb2ceaec23 (patch) | |
| tree | 985faf01c526763515731569fa01a99f4dbef36e /modules/zlib/src/infback.c | |
| parent | e0a8dcfed131ffa58a5e2cb1d30fe48c745c2fdc (diff) | |
| parent | 559824514dc95e02fbe81f1786e6ac13ee8e9d55 (diff) | |
| download | UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.tar UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.tar.gz UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.tar.lz UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.tar.xz UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.zip | |
Merge branch 'master' into js-modules
Diffstat (limited to 'modules/zlib/src/infback.c')
| -rw-r--r-- | modules/zlib/src/infback.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/zlib/src/infback.c b/modules/zlib/src/infback.c index f3833c2e4..59679ecbf 100644 --- a/modules/zlib/src/infback.c +++ b/modules/zlib/src/infback.c @@ -1,5 +1,5 @@ /* infback.c -- inflate using a call-back interface - * Copyright (C) 1995-2011 Mark Adler + * Copyright (C) 1995-2016 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -61,7 +61,7 @@ int stream_size; Tracev((stderr, "inflate: allocated\n")); strm->state = (struct internal_state FAR *)state; state->dmax = 32768U; - state->wbits = windowBits; + state->wbits = (uInt)windowBits; state->wsize = 1U << windowBits; state->window = window; state->wnext = 0; |