zstd: Improve version checking

diff --git a/libarchive/archive_write_add_filter_zstd.c b/libarchive/archive_write_add_filter_zstd.c
index 3ec52c5a0895030ef228352062035e69acc9d5c2..c74a35cded207b4b8adfb14c7417db6a8527321c 100644 (file)
--- 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