From ca6b86be44fc7ed618a7ab3bd021e208d38878b1 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Thu, 23 Oct 2014 18:47:04 -0500 Subject: Fix all tests for GNU/kFreeBSD It is necessary to check for both the kernel and c library because __FreeBSD_kernel is also defined on native FreeBSD [1]. [1] http://sourceforge.net/p/predef/wiki/OperatingSystems/ --- src/librc/librc-daemon.c | 2 +- src/librc/rc.h.in | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/librc') diff --git a/src/librc/librc-daemon.c b/src/librc/librc-daemon.c index 99703155..d19c3a33 100644 --- a/src/librc/librc-daemon.c +++ b/src/librc/librc-daemon.c @@ -30,7 +30,7 @@ #include "librc.h" -#if defined(__linux__) || defined (__FreeBSD_kernel__) +#if defined(__linux__) || (defined (__FreeBSD_kernel__) && defined(__GLIBC__)) static bool pid_is_exec(pid_t pid, const char *exec) { diff --git a/src/librc/rc.h.in b/src/librc/rc.h.in index 34f09f24..fca0dda1 100644 --- a/src/librc/rc.h.in +++ b/src/librc/rc.h.in @@ -42,7 +42,8 @@ extern "C" { #define RC_LIBEXECDIR "@LIBEXECDIR@" #if defined(PREFIX) #define RC_SVCDIR RC_LIBEXECDIR "/init.d" -#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__GNU__) +#elif defined(__linux__) || (defined(__FreeBSD_kernel__) && \ + defined(__GLIBC__)) || defined(__GNU__) #define RC_SVCDIR "/run/openrc" #else #define RC_SVCDIR RC_LIBEXECDIR "/init.d" -- cgit v1.2.3