From 97ede2dca82a0f210bcfd0b9e219b784facc668c Mon Sep 17 00:00:00 2001 From: Rolf Kalbermatter Date: Tue, 3 Jan 2006 13:33:22 +0100 Subject: [PATCH] include: Fix DECLSPEC_NORETURN for compilation with MS C compiler. --- include/wine/pthread.h | 4 +--- include/winternl.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/wine/pthread.h b/include/wine/pthread.h index 1ec33072529..36381fe4fb4 100644 --- a/include/wine/pthread.h +++ b/include/wine/pthread.h @@ -73,9 +73,7 @@ struct wine_pthread_callbacks /* we don't want to include winnt.h here */ #ifndef DECLSPEC_NORETURN -# if defined(_MSC_VER) && (_MSC_VER >= 1200) -# define DECLSPEC_NORETURN __declspec(noreturn) -# elif defined(__GNUC__) +# ifdef __GNUC__ # define DECLSPEC_NORETURN __attribute__((noreturn)) # else # define DECLSPEC_NORETURN diff --git a/include/winternl.h b/include/winternl.h index 2be14d353f8..dcd251e05b4 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2013,7 +2013,7 @@ BOOL WINAPI RtlEqualPrefixSid(PSID,PSID); BOOL WINAPI RtlEqualSid(PSID,PSID); BOOLEAN WINAPI RtlEqualString(const STRING*,const STRING*,BOOLEAN); BOOLEAN WINAPI RtlEqualUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); -void WINAPI RtlExitUserThread(ULONG) DECLSPEC_NORETURN; +void DECLSPEC_NORETURN WINAPI RtlExitUserThread(ULONG); NTSTATUS WINAPI RtlExpandEnvironmentStrings_U(PWSTR, const UNICODE_STRING*, UNICODE_STRING*, ULONG*); LONGLONG WINAPI RtlExtendedMagicDivide(LONGLONG,LONGLONG,INT); LONGLONG WINAPI RtlExtendedIntegerMultiply(LONGLONG,INT); -- 2.11.4.GIT