From eb8831a1416ab2ee8123b3add78421c2aa316b39 Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 19 Apr 2023 04:29:10 +0100 Subject: Rename attribute macros to namespaced RC_* This conflicts with linux-headers which uses __unused for some padding members on ppc64le at least. Closes: https://github.com/OpenRC/openrc/issues/622 --- src/openrc-shutdown/broadcast.c | 3 +-- src/openrc-shutdown/openrc-shutdown.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src/openrc-shutdown') diff --git a/src/openrc-shutdown/broadcast.c b/src/openrc-shutdown/broadcast.c index 232f4ab7..f21ee95c 100644 --- a/src/openrc-shutdown/broadcast.c +++ b/src/openrc-shutdown/broadcast.c @@ -42,8 +42,7 @@ static sigjmp_buf jbuf; /* * Alarm handler */ -/*ARGSUSED*/ -_noreturn static void handler(int arg _unused) +RC_NORETURN static void handler(int arg RC_UNUSED) { siglongjmp(jbuf, 1); } diff --git a/src/openrc-shutdown/openrc-shutdown.c b/src/openrc-shutdown/openrc-shutdown.c index c73d8e6d..fe1eb715 100644 --- a/src/openrc-shutdown/openrc-shutdown.c +++ b/src/openrc-shutdown/openrc-shutdown.c @@ -170,7 +170,7 @@ static void sleep_no_interrupt(int seconds) duration = remaining; } -_noreturn static void stop_shutdown(int sig) +RC_NORETURN static void stop_shutdown(int sig) { (void) sig; unlink(nologin_file); -- cgit v1.2.3