| Message ID | 20230320134219.22489-6-philmd@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | bulk: Do not declare function prototypes using 'extern' keyword | expand |
Philippe Mathieu-Daudé <philmd@linaro.org> wrote: > Under MSYS2, G_NORETURN is expanded to '[[noreturn]]'. > Simpler to use the same definition everywhere, unifying > the code style. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Juan Quintela <quintela@redhat.com>
diff --git a/include/sysemu/os-win32.h b/include/sysemu/os-win32.h index 0c00890a5e..0b9cae13e4 100644 --- a/include/sysemu/os-win32.h +++ b/include/sysemu/os-win32.h @@ -67,7 +67,7 @@ extern "C" { * which gets linked automatically. */ int __mingw_setjmp(jmp_buf); -void __attribute__((noreturn)) __mingw_longjmp(jmp_buf, int); +G_NORETURN void __mingw_longjmp(jmp_buf, int); #define setjmp(env) __mingw_setjmp(env) #define longjmp(env, val) __mingw_longjmp(env, val) #elif defined(_WIN64) diff --git a/tests/migration/stress.c b/tests/migration/stress.c index 88acf8dc25..54a95c07f1 100644 --- a/tests/migration/stress.c +++ b/tests/migration/stress.c @@ -36,7 +36,7 @@ static int gettid(void) } #endif -static __attribute__((noreturn)) void exit_failure(void) +static G_NORETURN void exit_failure(void) { if (getpid() == 1) { sync();
Under MSYS2, G_NORETURN is expanded to '[[noreturn]]'. Simpler to use the same definition everywhere, unifying the code style. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- include/sysemu/os-win32.h | 2 +- tests/migration/stress.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)