From: Harry Mallon <hjmallon@gmail.com>
Date: Tue, 14 Apr 2020 13:37:28 +0000 (+0100)
Subject: zstd: Improve version checking
X-Git-Tag: v3.4.3~18^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=09e78e00e345cd867e1d3961492cd2b0740db5e2;p=thirdparty%2Flibarchive.git

zstd: Improve version checking
---

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