From 5fb912b825969771562436592fb0d7dd4d276233 Mon Sep 17 00:00:00 2001 From: Chunmei Xu Date: Wed, 12 Feb 2020 18:16:10 +0800 Subject: [PATCH] fix build error with zlib-ng compat when build zlib-ng with zlib-compat and ZLIB_COMPAT-ON, error like this: /home/minizip/minizip-2.9.1/mz_crypt.c:19:14: fatal error: -ng.h: No such file or directory include "zlib-ng.h" /home/minizip/minizip-2.9.1/mz_strm_zlib.c:19:12: fatal error: zlib-ng.h: No such file or directory include "zlib-ng.h" Signed-off-by: Chunmei Xu --- mz_crypt.c | 2 +- mz_strm_zlib.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mz_crypt.c b/mz_crypt.c index 9c5ce66..1478e13 100644 --- a/mz_crypt.c +++ b/mz_crypt.c @@ -15,7 +15,7 @@ #if defined(HAVE_ZLIB) # include "zlib.h" -# if defined(ZLIBNG_VERNUM) +# if defined(ZLIBNG_VERNUM) && !defined(ZLIB_COMPAT) # include "zlib-ng.h" # endif #elif defined(HAVE_LZMA) diff --git a/mz_strm_zlib.c b/mz_strm_zlib.c index 8a483ce..763ba4e 100644 --- a/mz_strm_zlib.c +++ b/mz_strm_zlib.c @@ -15,7 +15,7 @@ #include "mz_strm_zlib.h" #include "zlib.h" -#if defined(ZLIBNG_VERNUM) +#if defined(ZLIBNG_VERNUM) && !defined(ZLIB_COMPAT) # include "zlib-ng.h" #endif