From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-740094-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 578BD138824
for <garchives@archives.gentoo.org>; Wed, 22 Oct 2014 16:23:56 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 64A49E0854;
Wed, 22 Oct 2014 16:23:54 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 0C0BEE0854
for <gentoo-commits@lists.gentoo.org>; Wed, 22 Oct 2014 16:23:53 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id D10BD340564
for <gentoo-commits@lists.gentoo.org>; Wed, 22 Oct 2014 16:23:52 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 7DB8B87A7
for <gentoo-commits@lists.gentoo.org>; Wed, 22 Oct 2014 16:23:51 +0000 (UTC)
From: "William Hubbs" <williamh@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" <williamh@gentoo.org>
Message-ID: <1413993907.3f82edbeb9251149c6aff071d6537379af4e5eea.williamh@OpenRC>
Subject: [gentoo-commits] proj/openrc:master commit in: src/rc/, src/librc/
X-VCS-Repository: proj/openrc
X-VCS-Files: src/librc/librc-daemon.c src/rc/mountinfo.c src/rc/rc-logger.c src/rc/runscript.c
X-VCS-Directories: src/librc/ src/rc/
X-VCS-Committer: williamh
X-VCS-Committer-Name: William Hubbs
X-VCS-Revision: 3f82edbeb9251149c6aff071d6537379af4e5eea
X-VCS-Branch: master
Date: Wed, 22 Oct 2014 16:23:51 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: ac917afe-2863-408b-95d5-5ed49a848c72
X-Archives-Hash: 01eda48f54b45dd7766abbdf3a1e5855
commit: 3f82edbeb9251149c6aff071d6537379af4e5eea
Author: Svante Signell <svante.signell <AT> gmail <DOT> com>
AuthorDate: Tue Oct 21 06:53:37 2014 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Oct 22 16:05:07 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=3f82edbe
Fix GNU/kFreeBSD port
Check for __FreeBSD_kernel instead of __GLIBC__ in source files.
note from William Hubbs:
I was told this is a better check for GNU/kFreeBSD than checking the
C library the source is being compiled against.
GNU/kFreeBSD than checking which library we are using.
---
src/librc/librc-daemon.c | 2 +-
src/rc/mountinfo.c | 4 ++--
src/rc/rc-logger.c | 2 +-
src/rc/runscript.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/librc/librc-daemon.c b/src/librc/librc-daemon.c
index 04f25b1..9970315 100644
--- a/src/librc/librc-daemon.c
+++ b/src/librc/librc-daemon.c
@@ -30,7 +30,7 @@
#include "librc.h"
-#if defined(__linux__) || defined (__GLIBC__)
+#if defined(__linux__) || defined (__FreeBSD_kernel__)
static bool
pid_is_exec(pid_t pid, const char *exec)
{
diff --git a/src/rc/mountinfo.c b/src/rc/mountinfo.c
index ce3f27d..7840987 100644
--- a/src/rc/mountinfo.c
+++ b/src/rc/mountinfo.c
@@ -39,7 +39,7 @@
# include <sys/statvfs.h>
# define statfs statvfs
# define F_FLAGS f_flag
-#elif defined (__linux__) || defined (__GLIBC__)
+#elif defined (__linux__) || defined (__FreeBSD_kernel__)
# include <mntent.h>
#endif
@@ -265,7 +265,7 @@ find_mounts(struct args *args)
return list;
}
-#elif defined (__linux__) || defined (__GLIBC__)
+#elif defined (__linux__) || defined (__FreeBSD_kernel__)
static struct mntent *
getmntfile(const char *file)
{
diff --git a/src/rc/rc-logger.c b/src/rc/rc-logger.c
index e8fb0ff..50cf618 100644
--- a/src/rc/rc-logger.c
+++ b/src/rc/rc-logger.c
@@ -44,7 +44,7 @@
#include <time.h>
#include <unistd.h>
-#if defined(__linux__) || defined(__GLIBC__)
+#if defined(__linux__) || defined(__FreeBSD_kernel__)
# include <pty.h>
#elif defined(__NetBSD__) || defined(__OpenBSD__)
# include <util.h>
diff --git a/src/rc/runscript.c b/src/rc/runscript.c
index de18f90..96aa683 100644
--- a/src/rc/runscript.c
+++ b/src/rc/runscript.c
@@ -51,7 +51,7 @@
#include <time.h>
#include <unistd.h>
-#if defined(__linux__) || defined(__GLIBC__)
+#if defined(__linux__) || defined(__FreeBSD_kernel__)
# include <pty.h>
#elif defined(__NetBSD__) || defined(__OpenBSD__)
# include <util.h>