From 97006561ea9a2c3c6fb09b4f77d6c109589a9219 Mon Sep 17 00:00:00 2001 From: Gabriel Date: Mon, 21 Sep 2020 13:22:56 +0200 Subject: [PATCH] Fix VC C++ 12.0 BROTLI_MSVC_VERSION_CHECK calls (#843) --- c/common/platform.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/c/common/platform.h b/c/common/platform.h index f5ca443..7e5807d 100644 --- a/c/common/platform.h +++ b/c/common/platform.h @@ -40,7 +40,7 @@ #define BROTLI_X_BIG_ENDIAN BIG_ENDIAN #endif -#if BROTLI_MSVC_VERSION_CHECK(12, 0, 0) +#if BROTLI_MSVC_VERSION_CHECK(18, 0, 0) #include #endif @@ -529,7 +529,7 @@ BROTLI_MIN_MAX(size_t) BROTLI_MIN_MAX(uint32_t) BROTLI_MIN_MAX(uint8_t) #if BROTLI_GNUC_HAS_BUILTIN(__builtin_ctzll, 3, 4, 0) || \ BROTLI_INTEL_VERSION_CHECK(16, 0, 0) #define BROTLI_TZCNT64 __builtin_ctzll -#elif BROTLI_MSVC_VERSION_CHECK(12, 0, 0) +#elif BROTLI_MSVC_VERSION_CHECK(18, 0, 0) #if defined(BROTLI_TARGET_X64) #define BROTLI_TZCNT64 _tzcnt_u64 #else /* BROTLI_TARGET_X64 */ @@ -546,7 +546,7 @@ static BROTLI_INLINE uint32_t BrotliBsf64Msvc(uint64_t x) { #if BROTLI_GNUC_HAS_BUILTIN(__builtin_clz, 3, 4, 0) || \ BROTLI_INTEL_VERSION_CHECK(16, 0, 0) #define BROTLI_BSR32(x) (31u ^ (uint32_t)__builtin_clz(x)) -#elif BROTLI_MSVC_VERSION_CHECK(12, 0, 0) +#elif BROTLI_MSVC_VERSION_CHECK(18, 0, 0) static BROTLI_INLINE uint32_t BrotliBsr32Msvc(uint32_t x) { unsigned long msb; _BitScanReverse(&msb, x);