diff options
| author | Svante Signell <svante.signell@gmail.com> | 2014-10-22 14:59:01 -0500 |
|---|---|---|
| committer | William Hubbs <w.d.hubbs@gmail.com> | 2014-10-23 13:00:24 -0500 |
| commit | 875f03e27c3475675f7b9572b071dd8c26257be7 (patch) | |
| tree | f825c2ce49a2fdc7a3150eed0b6a2a6dda410deb | |
| parent | 203b754f843fe6af0a40e983d557a9cdbc89f84b (diff) | |
fix defines for GNU/Hurd
| -rw-r--r-- | src/librc/librc.h | 4 | ||||
| -rw-r--r-- | 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 54c9a1ac..0824eba7 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 78409875..c4515ae7 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 */ |