Jacek Caban : include: Fix DECLSPEC_NORETURN usage.
Alexandre Julliard
julliard at winehq.org
Wed Apr 15 15:55:42 CDT 2020
Module: wine
Branch: master
Commit: 944ef25f1f1047fc617e19aa6847c5867702a927
URL: https://source.winehq.org/git/wine.git/?a=commit;h=944ef25f1f1047fc617e19aa6847c5867702a927
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed Apr 15 18:27:22 2020 +0200
include: Fix DECLSPEC_NORETURN usage.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
include/msvcrt/eh.h | 4 ++--
include/msvcrt/process.h | 10 +++++-----
include/msvcrt/stdlib.h | 8 ++++----
include/wine/exception.h | 6 +++---
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/include/msvcrt/eh.h b/include/msvcrt/eh.h
index 9f070e3953..4e23a9e5e5 100644
--- a/include/msvcrt/eh.h
+++ b/include/msvcrt/eh.h
@@ -40,8 +40,8 @@ terminate_function __cdecl set_terminate(terminate_function func);
unexpected_function __cdecl set_unexpected(unexpected_function func);
_se_translator_function __cdecl set_se_translator(_se_translator_function func);
-void __cdecl terminate(void) DECLSPEC_NORETURN;
-void __cdecl unexpected(void) DECLSPEC_NORETURN;
+_ACRTIMP DECLSPEC_NORETURN void __cdecl terminate(void);
+_ACRTIMP DECLSPEC_NORETURN void __cdecl unexpected(void);
#include <poppack.h>
diff --git a/include/msvcrt/process.h b/include/msvcrt/process.h
index 80be0e5bf6..2307b7990d 100644
--- a/include/msvcrt/process.h
+++ b/include/msvcrt/process.h
@@ -31,8 +31,8 @@ typedef unsigned int (__stdcall *_beginthreadex_start_routine_t)(void *);
uintptr_t __cdecl _beginthread(_beginthread_start_routine_t,unsigned int,void*);
uintptr_t __cdecl _beginthreadex(void*,unsigned int,_beginthreadex_start_routine_t,void*,unsigned int,unsigned int*);
intptr_t __cdecl _cwait(int*,intptr_t,int);
-void __cdecl _endthread(void) DECLSPEC_NORETURN;
-void __cdecl _endthreadex(unsigned int) DECLSPEC_NORETURN;
+_ACRTIMP DECLSPEC_NORETURN void __cdecl _endthread(void);
+_ACRTIMP DECLSPEC_NORETURN void __cdecl _endthreadex(unsigned int);
intptr_t WINAPIV _execl(const char*,const char*,...);
intptr_t WINAPIV _execle(const char*,const char*,...);
intptr_t WINAPIV _execlp(const char*,const char*,...);
@@ -53,9 +53,9 @@ intptr_t __cdecl _spawnvpe(int,const char*,const char* const *,const char* cons
void __cdecl _c_exit(void);
void __cdecl _cexit(void);
-void __cdecl _exit(int) DECLSPEC_NORETURN;
-void __cdecl abort(void) DECLSPEC_NORETURN;
-void __cdecl exit(int) DECLSPEC_NORETURN;
+_ACRTIMP DECLSPEC_NORETURN void __cdecl _exit(int);
+_ACRTIMP DECLSPEC_NORETURN void __cdecl abort(void);
+_ACRTIMP DECLSPEC_NORETURN void __cdecl exit(int);
_ACRTIMP DECLSPEC_NORETURN void __cdecl quick_exit(int);
int __cdecl system(const char*);
diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h
index 2ce4789350..ef60428a6a 100644
--- a/include/msvcrt/stdlib.h
+++ b/include/msvcrt/stdlib.h
@@ -182,9 +182,9 @@ errno_t __cdecl _ui64toa_s(unsigned __int64,char*,size_t,int);
char* __cdecl _ultoa(__msvcrt_ulong,char*,int);
errno_t __cdecl _ultoa_s(__msvcrt_ulong,char*,size_t,int);
-void __cdecl _Exit(int) DECLSPEC_NORETURN;
-void __cdecl _exit(int) DECLSPEC_NORETURN;
-void __cdecl abort(void) DECLSPEC_NORETURN;
+_ACRTIMP DECLSPEC_NORETURN void __cdecl _Exit(int);
+_ACRTIMP DECLSPEC_NORETURN void __cdecl _exit(int);
+_ACRTIMP DECLSPEC_NORETURN void __cdecl abort(void);
int __cdecl abs(int);
int __cdecl atexit(void (__cdecl *)(void));
double __cdecl atof(const char*);
@@ -198,7 +198,7 @@ div_t __cdecl div(int,int);
ldiv_t __cdecl ldiv(__msvcrt_long,__msvcrt_long);
#endif
lldiv_t __cdecl lldiv(__int64,__int64);
-void __cdecl exit(int) DECLSPEC_NORETURN;
+_ACRTIMP DECLSPEC_NORETURN void __cdecl exit(int);
void __cdecl free(void*);
char* __cdecl getenv(const char*);
__msvcrt_long __cdecl labs(__msvcrt_long);
diff --git a/include/wine/exception.h b/include/wine/exception.h
index 90ce30d6a2..4bf4c7e6d9 100644
--- a/include/wine/exception.h
+++ b/include/wine/exception.h
@@ -105,9 +105,9 @@ typedef struct { int reg; } __wine_jmp_buf;
extern int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) __wine_setjmpex( __wine_jmp_buf *buf,
EXCEPTION_REGISTRATION_RECORD *frame ) DECLSPEC_HIDDEN;
-extern void __cdecl __wine_longjmp( __wine_jmp_buf *buf, int retval ) DECLSPEC_HIDDEN DECLSPEC_NORETURN;
-extern void __cdecl __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_RECORD *record,
- void (*target)(void) ) DECLSPEC_HIDDEN DECLSPEC_NORETURN;
+extern void DECLSPEC_NORETURN __cdecl __wine_longjmp( __wine_jmp_buf *buf, int retval ) DECLSPEC_HIDDEN;
+extern void DECLSPEC_NORETURN __cdecl __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_RECORD *record,
+ void (*target)(void) ) DECLSPEC_HIDDEN;
extern DWORD __cdecl __wine_exception_handler( EXCEPTION_RECORD *record,
EXCEPTION_REGISTRATION_RECORD *frame,
CONTEXT *context,
More information about the wine-cvs
mailing list