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)

diff --git a/src/liblzma/common/memcmplen.h b/src/liblzma/common/memcmplen.h
index 4bb3c43660b3d6b2092001f26d6ee8623639095c..e1c78857bd99389ae63583bea0b0efdae97638ba 100644 (file)
--- 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