1 files changed, 5 insertions, 3 deletions
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" {

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;
91	typedef uint64_t ZPOS64_T;	91	typedef uint64_t ZPOS64_T;
92	#else	92	#else
93		93
94	/* Maximum unsigned 32-bit value used as placeholder for zip64 */	94
95	#define MAXU32 0xffffffff
96		95
97	#if defined(_MSC_VER) \|\| defined(__BORLANDC__)	96	#if defined(_MSC_VER) \|\| defined(__BORLANDC__)
98	typedef unsigned __int64 ZPOS64_T;	97	typedef unsigned __int64 ZPOS64_T;
@@ -102,7 +101,10 @@ typedef unsigned long long int ZPOS64_T;
102	#endif	101	#endif
103	#endif	102	#endif
104		103
105		104	/* Maximum unsigned 32-bit value used as placeholder for zip64 */
		105	#ifndef MAXU32
		106	#define MAXU32 (0xffffffff)
		107	#endif
106		108
107	#ifdef __cplusplus	109	#ifdef __cplusplus
108	extern "C" {	110	extern "C" {