c/minizip-ng
1
0
Fork 0
mirror of https://github.com/zlib-ng/minizip-ng synced 2025-03-28 21:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

avoid redefining already defined type

Browse Source
This commit is contained in:
Cœur 2024-11-01 23:33:52 +01:00 committed by Nathan Moinvaziri
parent 91112baa26
commit 91182928a4
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compat/crypt.h
View File

@ -26,10 +26,15 @@
*/ */
#ifndef _ZLIB_H #ifndef _ZLIB_H
# if (ZLIB_VERNUM < 0x1270) # ifndef ZLIB_VERNUM
typedef unsigned long z_crc_t; /* No zlib */
# else typedef uint32_t z_crc_t;
typedef uint32_t z_crc_t; # elif (ZLIB_VERNUM & 0xf != 0xf) && (ZLIB_VERNUM < 0x1270)
/* Define z_crc_t in zlib 1.2.6 and less */
typedef unsigned long z_crc_t;
# elif (ZLIB_VERNUM & 0xf == 0xf) && (ZLIB_VERNUM < 0x12df)
/* Define z_crc_t in zlib-ng 2.0.7 and less */
typedef unsigned int z_crc_t;
# endif # endif
#endif #endif

12
mz_crypt.c
View File

@ -34,11 +34,15 @@ int32_t mz_crypt_rand(uint8_t *buf, int32_t size) {
uint32_t mz_crypt_crc32_update(uint32_t value, const uint8_t *buf, int32_t size) { uint32_t mz_crypt_crc32_update(uint32_t value, const uint8_t *buf, int32_t size) {
#if defined(HAVE_ZLIB) #if defined(HAVE_ZLIB)
/* Define z_crc_t in zlib 1.2.5 and less or if using zlib-ng */ # ifndef ZLIB_VERNUM
# if (ZLIB_VERNUM < 0x1270) /* HAVE_ZLIB but no ZLIB_VERNUM? */
typedef unsigned long z_crc_t;
# else
typedef uint32_t z_crc_t; typedef uint32_t z_crc_t;
# elif (ZLIB_VERNUM & 0xf != 0xf) && (ZLIB_VERNUM < 0x1270)
/* Define z_crc_t in zlib 1.2.6 and less */
typedef unsigned long z_crc_t;
# elif (ZLIB_VERNUM & 0xf == 0xf) && (ZLIB_VERNUM < 0x12df)
/* Define z_crc_t in zlib-ng 2.0.7 and less */
typedef unsigned int z_crc_t;
# endif # endif
return (uint32_t)ZLIB_PREFIX(crc32)((z_crc_t)value, buf, (uInt)size); return (uint32_t)ZLIB_PREFIX(crc32)((z_crc_t)value, buf, (uInt)size);
#elif defined(HAVE_LZMA) #elif defined(HAVE_LZMA)