diff options
| author | Jia Tan <jiat0218@gmail.com> | 2023-04-19 22:22:16 +0800 |
|---|---|---|
| committer | Lasse Collin <lasse.collin@tukaani.org> | 2023-05-03 22:33:10 +0300 |
| commit | b02e74eb7387fe2bc91b3481d99e2755329efc05 (patch) | |
| tree | a6296939defb7076b729a88a7d2329669aa05f9e /src/common/tuklib_integer.h | |
| parent | tuklib_integer: Use __builtin_clz() with Clang. (diff) | |
| download | xz-b02e74eb7387fe2bc91b3481d99e2755329efc05.tar.xz | |
Windows: Include <intrin.h> when needed.
Legacy Windows did not need to #include <intrin.h> to use the MSVC
intrinsics. Newer versions likely just issue a warning, but the MSVC
documentation says to include the header file for the intrinsics we use.
GCC and Clang can "pretend" to be MSVC on Windows, so extra checks are
needed in tuklib_integer.h to only include <intrin.h> when it will is
actually needed.
Diffstat (limited to '')
| -rw-r--r-- | src/common/tuklib_integer.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/common/tuklib_integer.h b/src/common/tuklib_integer.h index bfb8683b..414c5626 100644 --- a/src/common/tuklib_integer.h +++ b/src/common/tuklib_integer.h @@ -52,6 +52,12 @@ // and such functions. #if defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 1500) # include <immintrin.h> +// Only include <intrin.h> when it is needed. GCC and Clang can both +// use __builtin's, so we only need Windows instrincs when using MSVC. +// GCC and Clang can set _MSC_VER on Windows, so we need to exclude these +// cases explicitly. +#elif defined(_MSC_VER) && !TUKLIB_GNUC_REQ(3, 4) && !defined(__clang__) +# include <intrin.h> #endif |