summaryrefslogtreecommitdiff
path: root/thirdparty/zlib/infback.c
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-01-06 19:17:39 +0100
committerGitHub <noreply@github.com>2017-01-06 19:17:39 +0100
commit55b601d62be967dae841d7d88c1c1d8aa3754e4e (patch)
tree59f1acb3400674b199322332740394075cfc0575 /thirdparty/zlib/infback.c
parent53ce643e520de193c085c0c23046dcbd2e5308a5 (diff)
parent9845bdde8dc3005185dc43c493380858d717596a (diff)
Merge pull request #7440 from akien-mga/thirdparty-updates
Updating some thirdparty libraries
Diffstat (limited to 'thirdparty/zlib/infback.c')
-rw-r--r--thirdparty/zlib/infback.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/thirdparty/zlib/infback.c b/thirdparty/zlib/infback.c
index f3833c2e43..59679ecbfc 100644
--- a/thirdparty/zlib/infback.c
+++ b/thirdparty/zlib/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;