From 5a87d91321b73ccb60381c808da3cdc1554ae3ca Mon Sep 17 00:00:00 2001 From: Lasse Collin Date: Tue, 18 Jul 2023 13:57:54 +0300 Subject: [PATCH] liblzma: Tweak #if condition in memcmplen.h. Maybe ICC always #defines _MSC_VER on Windows but now it's very clear which code will get used. (cherry picked from commit b406828a6dfd3caa4f77efe3ff3e3eea263eee62) --- src/liblzma/common/memcmplen.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/liblzma/common/memcmplen.h b/src/liblzma/common/memcmplen.h index 4bb3c436..e1c78857 100644 --- a/src/liblzma/common/memcmplen.h +++ b/src/liblzma/common/memcmplen.h @@ -74,11 +74,11 @@ lzma_memcmplen(const uint8_t *buf1, const uint8_t *buf2, const uint64_t x = read64ne(buf1 + len) - read64ne(buf2 + len); if (x != 0) { // MSVC or Intel C compiler on Windows -# if defined(_M_X64) && defined(_MSC_VER) +# if (defined(_MSC_VER) || defined(__INTEL_COMPILER)) && defined(_M_X64) unsigned long tmp; _BitScanForward64(&tmp, x); len += (uint32_t)tmp >> 3; - // GCC, clang, or Intel C compiler + // GCC, Clang, or Intel C compiler # else len += (uint32_t)__builtin_ctzll(x) >> 3; # endif