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/librc/librc-misc.c | 2 +- src/librc/librc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/librc') diff --git a/src/librc/librc-misc.c b/src/librc/librc-misc.c index 575bcfce..7a090fd2 100644 --- a/src/librc/librc-misc.c +++ b/src/librc/librc-misc.c @@ -127,7 +127,7 @@ rc_getline(char **line, size_t *len, FILE *fp) } char * -rc_proc_getent(const char *ent _unused) +rc_proc_getent(const char *ent RC_UNUSED) { #ifdef __linux__ FILE *fp; diff --git a/src/librc/librc.c b/src/librc/librc.c index da2ed4d0..a1bd706d 100644 --- a/src/librc/librc.c +++ b/src/librc/librc.c @@ -249,7 +249,7 @@ detect_prefix(const char *systype) } static const char * -detect_container(const char *systype _unused) +detect_container(const char *systype RC_UNUSED) { #ifdef __FreeBSD__ if (systype) { @@ -313,7 +313,7 @@ detect_container(const char *systype _unused) } static const char * -detect_vm(const char *systype _unused) +detect_vm(const char *systype RC_UNUSED) { #ifdef __NetBSD__ if (systype) { -- cgit v1.2.3