aboutsummaryrefslogtreecommitdiff
path: root/src/rc
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2020-01-19 15:24:20 +0000
committerWilliam Hubbs <w.d.hubbs@gmail.com>2020-01-19 16:52:21 -0600
commit375ef42393f3dc6edbaa2cb70c79b2366072db38 (patch)
tree0bd794bb627fdb09f40df94a12f6edb28201a860 /src/rc
parent6deda13754f1b60245945e953cce8d97e40e86fc (diff)
src/rc/rc-logger.h: fix build failure against gcc-10
On gcc-10 (and gcc-9 -fno-common) build fails as: ``` cc -L../librc -L../libeinfo -O2 -g -std=c99 -Wall -Wextra -Wimplicit -Wshadow \ -Wformat=2 -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn \ -Wmissing-format-attribute -Wnested-externs -Winline -Wwrite-strings \ -Wcast-align -Wcast-qual -Wpointer-arith -Wdeclaration-after-statement \ -Wsequence-point -Werror=implicit-function-declaration \ -Wl,-rpath=/lib -o openrc rc.o rc-logger.o rc-misc.o rc-plugin.o _usage.o -lutil -lrc -leinfo -Wl,-Bdynamic -ldl ld: rc-logger.o:/home/slyfox/dev/git/openrc/src/rc/rc-logger.h:16: multiple definition of `rc_logger_pid'; rc.o:openrc/src/rc/rc-logger.h:16: first defined here ld: rc-logger.o:/home/slyfox/dev/git/openrc/src/rc/rc-logger.h:17: multiple definition of `rc_logger_tty'; rc.o:openrc/src/rc/rc-logger.h:17: first defined here ``` gcc-10 will change the default from -fcommon to fno-common: https://gcc.gnu.org/PR85678. The error also happens if CFLAGS=-fno-common passed explicitly. This fixes #348.
Diffstat (limited to 'src/rc')
-rw-r--r--src/rc/rc-logger.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rc/rc-logger.h b/src/rc/rc-logger.h
index bf6e3e57..1da294b0 100644
--- a/src/rc/rc-logger.h
+++ b/src/rc/rc-logger.h
@@ -13,8 +13,8 @@
#ifndef RC_LOGGER_H
#define RC_LOGGER_H
-pid_t rc_logger_pid;
-int rc_logger_tty;
+extern pid_t rc_logger_pid;
+extern int rc_logger_tty;
extern bool rc_in_logger;
void rc_logger_open(const char *runlevel);