diff options
author | Sam James <sam@gentoo.org> | 2023-04-19 04:29:10 +0100 |
---|---|---|
committer | Mike Frysinger <vapier@gmail.com> | 2023-04-19 16:44:51 -0400 |
commit | eb8831a1416ab2ee8123b3add78421c2aa316b39 (patch) | |
tree | 3d5759e4a48db6a806174a8c8f1f0af24be11dba /src/supervise-daemon | |
parent | 0b5cb3abcb500d38f7302addb4182b07c1dc2ad7 (diff) |
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
Diffstat (limited to 'src/supervise-daemon')
-rw-r--r-- | src/supervise-daemon/supervise-daemon.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/supervise-daemon/supervise-daemon.c b/src/supervise-daemon/supervise-daemon.c index 2ef4ca04..836a1ec7 100644 --- a/src/supervise-daemon/supervise-daemon.c +++ b/src/supervise-daemon/supervise-daemon.c @@ -192,8 +192,8 @@ extern char **environ; # define SYS_ioprio_set __NR_ioprio_set #endif #if !defined(__DragonFly__) -static inline int ioprio_set(int which _unused, int who _unused, - int ioprio _unused) +static inline int ioprio_set(int which RC_UNUSED, int who RC_UNUSED, + int ioprio RC_UNUSED) { #ifdef SYS_ioprio_set return syscall(SYS_ioprio_set, which, who, ioprio); @@ -208,7 +208,7 @@ static void cleanup(void) free(changeuser); } -_noreturn static void re_exec_supervisor(void) +RC_NORETURN static void re_exec_supervisor(void) { syslog(LOG_WARNING, "Re-executing for %s", svcname); execlp("supervise-daemon", "supervise-daemon", svcname, "--reexec", @@ -354,7 +354,7 @@ static pid_t exec_command(const char *cmd) return pid; } -_noreturn static void child_process(char *exec, char **argv) +RC_NORETURN static void child_process(char *exec, char **argv) { RC_STRINGLIST *env_list; RC_STRING *env; @@ -587,7 +587,7 @@ _noreturn static void child_process(char *exec, char **argv) eerrorx("%s: failed to exec `%s': %s", applet, exec,strerror(errno)); } -_noreturn static void supervisor(char *exec, char **argv) +RC_NORETURN static void supervisor(char *exec, char **argv) { FILE *fp; char buf[2048]; |