diff --git a/src/vctools/crt/vcruntime/inc/intrin0.h b/src/vctools/crt/vcruntime/inc/intrin0.h index 1d19acda31..215bf98201 100644 --- a/src/vctools/crt/vcruntime/inc/intrin0.h +++ b/src/vctools/crt/vcruntime/inc/intrin0.h @@ -12,11 +12,6 @@ #pragma once #define __INTRIN0_H_ -#ifdef __clang__ -// This looks like a circular include but it is not because clang overrides with their specific version. -// See further discussion in LLVM-47099. -#include -#else /* ^^^ __clang__ // !__clang__ vvv */ #include #if _VCRT_COMPILER_PREPROCESSOR && !defined(__midl) @@ -273,8 +268,10 @@ __MACHINEX86_X64(unsigned int __popcnt(unsigned int)) __MACHINEX86_X64(unsigned short __popcnt16(unsigned short)) __MACHINEX64(unsigned __int64 __popcnt64(unsigned __int64)) __MACHINEX64(unsigned __int64 __shiftright128(unsigned __int64 _LowPart, unsigned __int64 _HighPart, unsigned char _Shift)) +#ifndef __clang__ __MACHINEX86_X64(unsigned int _tzcnt_u32(unsigned int)) __MACHINEX64(unsigned __int64 _tzcnt_u64(unsigned __int64)) +#endif // __clang__ __MACHINEX64(unsigned __int64 _umul128(unsigned __int64 _Multiplier, unsigned __int64 _Multiplicand, unsigned __int64 * _HighProduct)) __MACHINE(double __ceil(double)) __MACHINE(float __ceilf(float)) @@ -307,4 +304,3 @@ __MACHINE(void * __cdecl __builtin_assume_aligned(const void *, size_t, ...) noe #endif #pragma warning(pop) // _VCRUNTIME_DISABLED_WARNINGS #endif /* _VCRT_COMPILER_PREPROCESSOR && !defined(__midl) */ -#endif /* ^^^ !__clang__ */ \ No newline at end of file