From 09e78e00e345cd867e1d3961492cd2b0740db5e2 Mon Sep 17 00:00:00 2001 From: Harry Mallon Date: Tue, 14 Apr 2020 14:37:28 +0100 Subject: [PATCH] zstd: Improve version checking --- libarchive/archive_write_add_filter_zstd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libarchive/archive_write_add_filter_zstd.c b/libarchive/archive_write_add_filter_zstd.c index 3ec52c5a0..c74a35cde 100644 --- a/libarchive/archive_write_add_filter_zstd.c +++ b/libarchive/archive_write_add_filter_zstd.c @@ -189,12 +189,13 @@ archive_compressor_zstd_options(struct archive_write_filter *f, const char *key, } #if HAVE_ZSTD_H && HAVE_LIBZSTD maximum = ZSTD_maxCLevel(); -#endif -#if HAVE_ZSTD_H && HAVE_LIBZSTD && ZSTD_VERSION_NUMBER >= MINVER_MINCLEVEL +#if ZSTD_VERSION_NUMBER >= MINVER_MINCLEVEL if (ZSTD_versionNumber() >= MINVER_MINCLEVEL) { minimum = ZSTD_minCLevel(); } - else if (ZSTD_versionNumber() < MINVER_NEGCLEVEL) { + else +#endif + if (ZSTD_versionNumber() < MINVER_NEGCLEVEL) { minimum = CLEVEL_STD_MIN; } #endif -- 2.47.2