diff options
| author | Mark Adler <madler@alumni.caltech.edu> | 2021-12-31 17:22:37 -0800 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2021-12-31 17:22:37 -0800 |
| commit | b135d46eaf5ba36b549be9db857c580f00b6182a (patch) | |
| tree | 1c26e7e68d04b9680dca66424970f1d49779a055 | |
| parent | 8678871f18f4dd51101a9db1e37791f975969079 (diff) | |
| download | zlib-b135d46eaf5ba36b549be9db857c580f00b6182a.tar.gz zlib-b135d46eaf5ba36b549be9db857c580f00b6182a.tar.bz2 zlib-b135d46eaf5ba36b549be9db857c580f00b6182a.zip | |
minizip warning fix if MAXU32 already defined. (gvollant)
| -rw-r--r-- | contrib/minizip/ioapi.h | 8 |
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; | |||
| 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" { |