X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=zlib%2Finfback.c;h=59679ecbfc5d778ca85d9ced87565f69bcb4635c;hb=ad7c657b9e4a97a2d1a7cf0afc8568e8f6954b67;hp=981aff17c2d4ab0f157e503219e4ca9bd68eaf3a;hpb=5ca28f792883afb409ae145666fc3662c3a3aed5;p=deliverable%2Fbinutils-gdb.git

diff --git a/zlib/infback.c b/zlib/infback.c
index 981aff17c2..59679ecbfc 100644
--- a/zlib/infback.c
+++ b/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;
@@ -255,7 +255,7 @@ out_func out;
 void FAR *out_desc;
 {
     struct inflate_state FAR *state;
-    unsigned char FAR *next;    /* next input */
+    z_const unsigned char FAR *next;    /* next input */
     unsigned char FAR *put;     /* next output */
     unsigned have, left;        /* available input and output */
     unsigned long hold;         /* bit buffer */