AuroraMiddleware/brotli
1
0
Fork 0
mirror of https://github.com/google/brotli.git synced 2024-11-21 19:20:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix VC C++ 12.0 BROTLI_MSVC_VERSION_CHECK calls (#843)

Browse Source
This commit is contained in:
Gabriel 2020-09-21 13:22:56 +02:00 committed by GitHub
parent 0cd2e3926e
commit 97006561ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
c/common/platform.h
View File

@ -40,7 +40,7 @@
#define BROTLI_X_BIG_ENDIAN BIG_ENDIAN #define BROTLI_X_BIG_ENDIAN BIG_ENDIAN
#endif #endif
#if BROTLI_MSVC_VERSION_CHECK(12, 0, 0) #if BROTLI_MSVC_VERSION_CHECK(18, 0, 0)
#include <intrin.h> #include <intrin.h>
#endif #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) || \ #if BROTLI_GNUC_HAS_BUILTIN(__builtin_ctzll, 3, 4, 0) || \
BROTLI_INTEL_VERSION_CHECK(16, 0, 0) BROTLI_INTEL_VERSION_CHECK(16, 0, 0)
#define BROTLI_TZCNT64 __builtin_ctzll #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) #if defined(BROTLI_TARGET_X64)
#define BROTLI_TZCNT64 _tzcnt_u64 #define BROTLI_TZCNT64 _tzcnt_u64
#else /* BROTLI_TARGET_X64 */ #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) || \ #if BROTLI_GNUC_HAS_BUILTIN(__builtin_clz, 3, 4, 0) || \
BROTLI_INTEL_VERSION_CHECK(16, 0, 0) BROTLI_INTEL_VERSION_CHECK(16, 0, 0)
#define BROTLI_BSR32(x) (31u ^ (uint32_t)__builtin_clz(x)) #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) { static BROTLI_INLINE uint32_t BrotliBsr32Msvc(uint32_t x) {
unsigned long msb; unsigned long msb;
_BitScanReverse(&msb, x); _BitScanReverse(&msb, x);