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 /contrib | |
| parent | 8678871f18f4dd51101a9db1e37791f975969079 (diff) | |
| download | zlib-b135d46eaf5ba36b549be9db857c580f00b6182a.tar.gz | |
minizip warning fix if MAXU32 already defined. (gvollant)
Diffstat (limited to 'contrib')
| -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; 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" { |