From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CA35E138827 for ; Thu, 23 Oct 2014 19:13:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9F275E0824; Thu, 23 Oct 2014 19:13:32 +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 1C9ADE07DB for ; Thu, 23 Oct 2014 19:13:32 +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 DD9E134056D for ; Thu, 23 Oct 2014 19:13:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C008C88E7 for ; Thu, 23 Oct 2014 19:13:28 +0000 (UTC) From: "William Hubbs" 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" Message-ID: <1414087224.875f03e27c3475675f7b9572b071dd8c26257be7.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: src/librc/, src/rc/ X-VCS-Repository: proj/openrc X-VCS-Files: src/librc/librc.h src/rc/mountinfo.c X-VCS-Directories: src/rc/ src/librc/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 875f03e27c3475675f7b9572b071dd8c26257be7 X-VCS-Branch: master Date: Thu, 23 Oct 2014 19:13:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 889dd119-b424-40e3-beb9-f3c46a8e29b4 X-Archives-Hash: bca52d2e55967a1468fff58e0622bf40 commit: 875f03e27c3475675f7b9572b071dd8c26257be7 Author: Svante Signell gmail com> AuthorDate: Wed Oct 22 19:59:01 2014 +0000 Commit: William Hubbs gentoo org> CommitDate: Thu Oct 23 18:00:24 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=875f03e2 fix defines for GNU/Hurd --- src/librc/librc.h | 4 +++- src/rc/mountinfo.c | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/librc/librc.h b/src/librc/librc.h index 54c9a1a..0824eba 100644 --- a/src/librc/librc.h +++ b/src/librc/librc.h @@ -57,11 +57,13 @@ #include #include -#ifdef BSD +#if defined(BSD) && !defined(__GNU__) #include #include #include #include +#else +#include #endif #include "rc.h" diff --git a/src/rc/mountinfo.c b/src/rc/mountinfo.c index 7840987..c4515ae 100644 --- a/src/rc/mountinfo.c +++ b/src/rc/mountinfo.c @@ -35,11 +35,11 @@ # include # include # define F_FLAGS f_flags -#elif defined(BSD) +#elif defined(BSD) && !defined(__GNU__) # include # define statfs statvfs # define F_FLAGS f_flag -#elif defined (__linux__) || defined (__FreeBSD_kernel__) +#elif defined (__linux__) || defined (__FreeBSD_kernel__) || defined(__GNU__) # include #endif @@ -168,7 +168,7 @@ process_mount(RC_STRINGLIST *list, struct args *args, return -1; } -#ifdef BSD +#if defined(BSD) && !defined(__GNU__) /* Translate the mounted options to english * This is taken directly from FreeBSD mount.c */