From: Jacek Caban <jacek@codeweavers.com> Fixes Clang -Wimplicit-function-declaration C++ warnings. --- include/winnt.h | 54 ++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index a7261cf5919..f66f5494ee3 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -7048,24 +7048,6 @@ typedef enum _FIRMWARE_TYPE #ifdef _MSC_VER -#pragma intrinsic(_BitScanForward) -#pragma intrinsic(_BitScanReverse) -#pragma intrinsic(_InterlockedAnd) -#pragma intrinsic(_InterlockedCompareExchange) -#pragma intrinsic(_InterlockedCompareExchange64) -#pragma intrinsic(_InterlockedCompareExchangePointer) -#pragma intrinsic(_InterlockedExchange) -#pragma intrinsic(_InterlockedExchangeAdd) -#pragma intrinsic(_InterlockedExchangeAdd16) -#pragma intrinsic(_InterlockedExchangePointer) -#pragma intrinsic(_InterlockedIncrement) -#pragma intrinsic(_InterlockedIncrement16) -#pragma intrinsic(_InterlockedDecrement) -#pragma intrinsic(_InterlockedDecrement16) -#pragma intrinsic(_InterlockedOr) -#pragma intrinsic(_InterlockedXor) -#pragma intrinsic(__fastfail) - BOOLEAN _BitScanForward(unsigned long*,unsigned long); BOOLEAN _BitScanReverse(unsigned long*,unsigned long); long _InterlockedAnd(long volatile *,long); @@ -7084,9 +7066,27 @@ long _InterlockedOr(long volatile *,long); long _InterlockedXor(long volatile *,long); DECLSPEC_NORETURN void __fastfail(unsigned int); +#pragma intrinsic(_BitScanForward) +#pragma intrinsic(_BitScanReverse) +#pragma intrinsic(_InterlockedAnd) +#pragma intrinsic(_InterlockedCompareExchange) +#pragma intrinsic(_InterlockedCompareExchange64) +#pragma intrinsic(_InterlockedCompareExchangePointer) +#pragma intrinsic(_InterlockedExchange) +#pragma intrinsic(_InterlockedExchangeAdd) +#pragma intrinsic(_InterlockedExchangeAdd16) +#pragma intrinsic(_InterlockedExchangePointer) +#pragma intrinsic(_InterlockedIncrement) +#pragma intrinsic(_InterlockedIncrement16) +#pragma intrinsic(_InterlockedDecrement) +#pragma intrinsic(_InterlockedDecrement16) +#pragma intrinsic(_InterlockedOr) +#pragma intrinsic(_InterlockedXor) +#pragma intrinsic(__fastfail) + #if !defined(__i386__) || __has_builtin(_InterlockedAnd64) -#pragma intrinsic(_InterlockedAnd64) __int64 _InterlockedAnd64(__int64 volatile *, __int64); +#pragma intrinsic(_InterlockedAnd64) #else static FORCEINLINE __int64 InterlockedAnd64( __int64 volatile *dest, __int64 val ) { @@ -7097,8 +7097,8 @@ static FORCEINLINE __int64 InterlockedAnd64( __int64 volatile *dest, __int64 val #endif #if !defined(__i386__) || __has_builtin(_InterlockedExchangeAdd64) -#pragma intrinsic(_InterlockedExchangeAdd64) __int64 _InterlockedExchangeAdd64(__int64 volatile *, __int64); +#pragma intrinsic(_InterlockedExchangeAdd64) #else static FORCEINLINE __int64 InterlockedExchangeAdd64( __int64 volatile *dest, __int64 val ) { @@ -7109,8 +7109,8 @@ static FORCEINLINE __int64 InterlockedExchangeAdd64( __int64 volatile *dest, __i #endif #if !defined(__i386__) || __has_builtin(_InterlockedDecrement64) -#pragma intrinsic(_InterlockedDecrement64) __int64 _InterlockedDecrement64(__int64 volatile *); +#pragma intrinsic(_InterlockedDecrement64) #else static FORCEINLINE __int64 InterlockedDecrement64( __int64 volatile *dest ) { @@ -7119,8 +7119,8 @@ static FORCEINLINE __int64 InterlockedDecrement64( __int64 volatile *dest ) #endif #if !defined(__i386__) || __has_builtin(_InterlockedIncrement64) -#pragma intrinsic(_InterlockedIncrement64) __int64 _InterlockedIncrement64(__int64 volatile *); +#pragma intrinsic(_InterlockedIncrement64) #else static FORCEINLINE __int64 InterlockedIncrement64( __int64 volatile *dest ) { @@ -7129,8 +7129,8 @@ static FORCEINLINE __int64 InterlockedIncrement64( __int64 volatile *dest ) #endif #if !defined(__i386__) || __has_builtin(_InterlockedOr64) -#pragma intrinsic(_InterlockedOr64) __int64 _InterlockedOr64(__int64 volatile *, __int64); +#pragma intrinsic(_InterlockedOr64) #else static FORCEINLINE __int64 InterlockedOr64( __int64 volatile *dest, __int64 val ) { @@ -7141,8 +7141,8 @@ static FORCEINLINE __int64 InterlockedOr64( __int64 volatile *dest, __int64 val #endif #if !defined(__i386__) || __has_builtin(_InterlockedXor64) -#pragma intrinsic(_InterlockedXor64) __int64 _InterlockedXor64(__int64 volatile *, __int64); +#pragma intrinsic(_InterlockedXor64) #else static FORCEINLINE __int64 InterlockedXor64( __int64 volatile *dest, __int64 val ) { @@ -7179,8 +7179,8 @@ static FORCEINLINE void MemoryBarrier(void) #elif defined(__x86_64__) -#pragma intrinsic(__faststorefence) void __faststorefence(void); +#pragma intrinsic(__faststorefence) static FORCEINLINE void MemoryBarrier(void) { @@ -7217,8 +7217,8 @@ static FORCEINLINE void MemoryBarrier(void) #endif /* _MSC_VER >= 1700 */ #if defined(__i386__) || defined(__x86_64__) -#pragma intrinsic(_ReadWriteBarrier) void _ReadWriteBarrier(void); +#pragma intrinsic(_ReadWriteBarrier) #endif /* defined(__i386__) || defined(__x86_64__) */ static void __wine_memory_barrier_acq_rel(void) @@ -7553,8 +7553,8 @@ static FORCEINLINE DECLSPEC_NORETURN void __fastfail(unsigned int code) #if defined(_MSC_VER) && (!defined(__clang__) || !defined(__aarch64__) || __has_builtin(_InterlockedCompareExchange128)) -#pragma intrinsic(_InterlockedCompareExchange128) unsigned char _InterlockedCompareExchange128(volatile __int64 *, __int64, __int64, __int64 *); +#pragma intrinsic(_InterlockedCompareExchange128) #else -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9924