Fix Gcc 8 warnings (#632)

[proxmark3-svn] / zlib / inflate.c

diff --git a/zlib/inflate.c b/zlib/inflate.c
index 417b2c41bf93e434550e65efdadda4c32381f0dc..df2f9d6602201272c19e50ed7e84bca149f743eb 100644 (file)
--- a/zlib/inflate.c
+++ b/zlib/inflate.c
@@ -80,6 +80,15 @@
  * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
  */
 
+//-----------------------------------------------------------------------------
+// This version of zlib is modified for use within the Proxmark3 project. 
+// Files from the original distribution which are not required for this
+// purpose are not included. All modifications can easily be found
+// by searching for #ifdef ZLIB_PM3_TUNED and #ifndef ZLIB_PM3_TUNED.
+//-----------------------------------------------------------------------------
+
+
+ 
 #include "zutil.h"
 #include "inftrees.h"
 #include "inflate.h"
@@ -1514,7 +1523,7 @@ 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 ~0UL << 16;
     state = (struct inflate_state FAR *)strm->state;
     return ((long)(state->back) << 16) +
         (state->mode == COPY ? state->length :