aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2023-07-18 13:57:54 +0300
committerLasse Collin <lasse.collin@tukaani.org>2023-07-18 13:57:54 +0300
commit97fd5cb669ee0afc48d2087675ab166aff89eaa2 (patch)
treeaf798379e20a6731202b400dffed2a3147599ce8
parentliblzma: Omit unnecessary parenthesis in a preprocessor directive. (diff)
downloadxz-97fd5cb669ee0afc48d2087675ab166aff89eaa2.tar.xz
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.
Diffstat (limited to '')
-rw-r--r--src/liblzma/common/memcmplen.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/liblzma/common/memcmplen.h b/src/liblzma/common/memcmplen.h
index 4d1ef7b4..3c12422b 100644
--- a/src/liblzma/common/memcmplen.h
+++ b/src/liblzma/common/memcmplen.h
@@ -70,11 +70,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