commit: 875f03e27c3475675f7b9572b071dd8c26257be7
Author: Svante Signell <svante.signell <AT> gmail <DOT> com>
AuthorDate: Wed Oct 22 19:59:01 2014 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> 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 <time.h>
#include <unistd.h>
-#ifdef BSD
+#if defined(BSD) && !defined(__GNU__)
#include <sys/param.h>
#include <sys/user.h>
#include <sys/sysctl.h>
#include <kvm.h>
+#else
+#include <sys/param.h>
#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 <sys/ucred.h>
# include <sys/mount.h>
# define F_FLAGS f_flags
-#elif defined(BSD)
+#elif defined(BSD) && !defined(__GNU__)
# include <sys/statvfs.h>
# define statfs statvfs
# define F_FLAGS f_flag
-#elif defined (__linux__) || defined (__FreeBSD_kernel__)
+#elif defined (__linux__) || defined (__FreeBSD_kernel__) || defined(__GNU__)
# include <mntent.h>
#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 */
