From: Pavel P <pavlov.pavel@gmail.com>
Date: Thu, 23 Jan 2025 23:25:07 +0000 (+0200)
Subject: Check `STATIC_BMI2` instead of `STATIC_BMI2 == 1`
X-Git-Tag: v1.5.7^2~12^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7e8fc339b1ce64bbbfe3dc149b8cc0a13644844;p=thirdparty%2Fzstd.git

Check `STATIC_BMI2` instead of `STATIC_BMI2 == 1`
---

diff --git a/lib/common/bits.h b/lib/common/bits.h
index 992cc6925..8e09535a4 100644
--- a/lib/common/bits.h
+++ b/lib/common/bits.h
@@ -29,7 +29,7 @@ MEM_STATIC unsigned ZSTD_countTrailingZeros32(U32 val)
 {
     assert(val != 0);
 #   if defined(_MSC_VER)
-#       if STATIC_BMI2 == 1
+#       if STATIC_BMI2
             return (unsigned)_tzcnt_u32(val);
 #       else
             if (val != 0) {
@@ -70,7 +70,7 @@ MEM_STATIC unsigned ZSTD_countLeadingZeros32(U32 val)
 {
     assert(val != 0);
 #   if defined(_MSC_VER)
-#       if STATIC_BMI2 == 1
+#       if STATIC_BMI2
             return (unsigned)_lzcnt_u32(val);
 #       else
             if (val != 0) {
@@ -95,7 +95,7 @@ MEM_STATIC unsigned ZSTD_countTrailingZeros64(U64 val)
 {
     assert(val != 0);
 #   if defined(_MSC_VER) && defined(_WIN64)
-#       if STATIC_BMI2 == 1
+#       if STATIC_BMI2
             return (unsigned)_tzcnt_u64(val);
 #       else
             if (val != 0) {
@@ -128,7 +128,7 @@ MEM_STATIC unsigned ZSTD_countLeadingZeros64(U64 val)
 {
     assert(val != 0);
 #   if defined(_MSC_VER) && defined(_WIN64)
-#       if STATIC_BMI2 == 1
+#       if STATIC_BMI2
             return (unsigned)_lzcnt_u64(val);
 #       else
             if (val != 0) {
diff --git a/lib/common/bitstream.h b/lib/common/bitstream.h
index 2c4245678..3b7ad483d 100644
--- a/lib/common/bitstream.h
+++ b/lib/common/bitstream.h
@@ -161,7 +161,7 @@ MEM_STATIC size_t BIT_initCStream(BIT_CStream_t* bitC,
 
 FORCE_INLINE_TEMPLATE BitContainerType BIT_getLowerBits(BitContainerType bitContainer, U32 const nbBits)
 {
-#if defined(STATIC_BMI2) && STATIC_BMI2 == 1 && !defined(ZSTD_NO_INTRINSICS)
+#if STATIC_BMI2 && !defined(ZSTD_NO_INTRINSICS)
 #  if (defined(__x86_64__) || defined(_M_X64)) && !defined(__ILP32__)
     return _bzhi_u64(bitContainer, nbBits);
 #  else