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

ZLIB_COMPAT is not defined for libminizip project, so just always use zng_ when zlib-ng is detected.

Browse Source
This commit is contained in:
Nathan Moinvaziri 2019-01-22 10:23:03 -08:00
parent cdedc087e7
commit 84ec941f15
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -108,7 +108,7 @@ if(MZ_ZLIB AND NOT MZ_LIBCOMP)
endif() endif()
endif() endif()
endforeach() endforeach()
message("${CMAKE_ARGS}")
ExternalProject_Add(zlib ExternalProject_Add(zlib
PREFIX zlib PREFIX zlib
GIT_REPOSITORY ${ZLIB_REPOSITORY} GIT_REPOSITORY ${ZLIB_REPOSITORY}
@ -182,6 +182,9 @@ endif()
if(NOT MZ_PKCRYPT AND NOT MZ_WZAES) if(NOT MZ_PKCRYPT AND NOT MZ_WZAES)
add_definitions(-DMZ_ZIP_NO_ENCRYPTION) add_definitions(-DMZ_ZIP_NO_ENCRYPTION)
endif() endif()
if(ZLIB_COMPAT)
add_definitions(-DZLIB_COMPAT)
endif()
# Check for system includes # Check for system includes
check_include_file(stdint.h HAVE_STDINT_H) check_include_file(stdint.h HAVE_STDINT_H)

6
mz_crypt.c
View File

@ -15,7 +15,7 @@
#if defined(HAVE_ZLIB) #if defined(HAVE_ZLIB)
# include "zlib.h" # include "zlib.h"
# if defined(ZLIBNG_VERNUM) && !defined(ZLIB_COMPAT) # if defined(ZLIBNG_VERNUM)
# include "zlib-ng.h" # include "zlib-ng.h"
# endif # endif
#elif defined(HAVE_LZMA) #elif defined(HAVE_LZMA)
@ -26,9 +26,7 @@
/* Define z_crc_t in zlib 1.2.5 and less or if using zlib-ng */ /* Define z_crc_t in zlib 1.2.5 and less or if using zlib-ng */
#if defined(HAVE_ZLIB) && defined(ZLIBNG_VERNUM) #if defined(HAVE_ZLIB) && defined(ZLIBNG_VERNUM)
# if !defined(ZLIB_COMPAT) # define ZLIB_PREFIX(x) zng_ ## x
# define ZLIB_PREFIX(x) zng_ ## x
# endif
typedef uint32_t z_crc_t; typedef uint32_t z_crc_t;
#elif defined(HAVE_ZLIB) #elif defined(HAVE_ZLIB)
# define ZLIB_PREFIX(x) x # define ZLIB_PREFIX(x) x

6
mz_strm_zlib.c
View File

@ -15,13 +15,13 @@
#include "mz_strm_zlib.h" #include "mz_strm_zlib.h"
#include "zlib.h" #include "zlib.h"
#if defined(ZLIBNG_VERNUM) && !defined(ZLIB_COMPAT) #if defined(ZLIBNG_VERNUM)
# include "zlib-ng.h" # include "zlib-ng.h"
#endif #endif
/***************************************************************************/ /***************************************************************************/
#if defined(ZLIBNG_VERNUM) && !defined(ZLIB_COMPAT) #if defined(ZLIBNG_VERNUM)
# define ZLIB_PREFIX(x) zng_ ## x # define ZLIB_PREFIX(x) zng_ ## x
typedef zng_stream zlib_stream; typedef zng_stream zlib_stream;
#else #else