From: Mark Adler <madler@alumni.caltech.edu>
Date: Sat, 1 Jan 2022 01:22:37 +0000 (-0800)
Subject: minizip warning fix if MAXU32 already defined. (gvollant)
X-Git-Tag: v1.2.12~9
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=b135d46eaf5ba36b549be9db857c580f00b6182a;p=zlib.git

minizip warning fix if MAXU32 already defined. (gvollant)
---

diff --git a/contrib/minizip/ioapi.h b/contrib/minizip/ioapi.h
index 8dcbdb0..114bfab 100644
--- a/contrib/minizip/ioapi.h
+++ b/contrib/minizip/ioapi.h
@@ -91,8 +91,7 @@ typedef  64BIT_INT_CUSTOM_TYPE ZPOS64_T;
 typedef uint64_t ZPOS64_T;
 #else
 
-/* Maximum unsigned 32-bit value used as placeholder for zip64 */
-#define MAXU32 0xffffffff
+
 
 #if defined(_MSC_VER) || defined(__BORLANDC__)
 typedef unsigned __int64 ZPOS64_T;
@@ -102,7 +101,10 @@ typedef unsigned long long int ZPOS64_T;
 #endif
 #endif
 
-
+/* Maximum unsigned 32-bit value used as placeholder for zip64 */
+#ifndef MAXU32
+#define MAXU32 (0xffffffff)
+#endif
 
 #ifdef __cplusplus
 extern "C" {