From 6ac5fe69d0de82d0d658cb35960b0731a3001605 Mon Sep 17 00:00:00 2001
From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Fri, 23 Nov 2018 08:37:19 -0800
Subject: [PATCH] Fixed definitions of limits and some casting issues.

---
 mz.h              | 6 +++---
 mz_strm_pkcrypt.c | 2 +-
 mz_strm_wzaes.c   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mz.h b/mz.h
index 0050fd6..233c5f0 100644
--- a/mz.h
+++ b/mz.h
@@ -186,7 +186,7 @@ typedef unsigned long long uint64_t;
 #  define INT16_MAX   32767
 #endif
 #ifndef INT32_MAX 
-#  define INT32_MAX   2147483647
+#  define INT32_MAX   2147483647L
 #endif
 #ifndef INT64_MAX
 #  define INT64_MAX   9223372036854775807LL
@@ -195,10 +195,10 @@ typedef unsigned long long uint64_t;
 #  define UINT16_MAX  65535U
 #endif
 #ifndef UINT32_MAX 
-#  define UINT32_MAX  4294967295U 
+#  define UINT32_MAX  4294967295UL 
 #endif
 #ifndef UINT64_MAX
-#  define UINT64_MAX  18446744073709551615LL
+#  define UINT64_MAX  18446744073709551615ULL
 #endif
 
 /***************************************************************************/
diff --git a/mz_strm_pkcrypt.c b/mz_strm_pkcrypt.c
index ee60e74..7eaed82 100644
--- a/mz_strm_pkcrypt.c
+++ b/mz_strm_pkcrypt.c
@@ -216,7 +216,7 @@ int32_t mz_stream_pkcrypt_read(void *stream, void *buf, int32_t size)
     int32_t i = 0;
 
 
-    if (bytes_to_read > (int32_t)(pkcrypt->max_total_in - pkcrypt->total_in))
+    if ((int64_t)bytes_to_read > (pkcrypt->max_total_in - pkcrypt->total_in))
         bytes_to_read = (int32_t)(pkcrypt->max_total_in - pkcrypt->total_in);
 
     read = mz_stream_read(pkcrypt->stream.base, buf, bytes_to_read);
diff --git a/mz_strm_wzaes.c b/mz_strm_wzaes.c
index 31874d2..d791cfa 100644
--- a/mz_strm_wzaes.c
+++ b/mz_strm_wzaes.c
@@ -215,7 +215,7 @@ int32_t mz_stream_wzaes_read(void *stream, void *buf, int32_t size)
     int32_t read = 0;
 
     max_total_in = wzaes->max_total_in - MZ_AES_FOOTER_SIZE;
-    if (bytes_to_read > (int32_t)(max_total_in - wzaes->total_in))
+    if ((int64_t)bytes_to_read > (max_total_in - wzaes->total_in))
         bytes_to_read = (int32_t)(max_total_in - wzaes->total_in);
 
     read = mz_stream_read(wzaes->stream.base, buf, bytes_to_read);