aboutsummaryrefslogtreecommitdiff
path: root/src/rc/mountinfo.c
diff options
context:
space:
mode:
authorWilliam Hubbs <w.d.hubbs@gmail.com>2014-10-23 18:47:04 -0500
committerWilliam Hubbs <w.d.hubbs@gmail.com>2014-10-23 18:47:24 -0500
commitca6b86be44fc7ed618a7ab3bd021e208d38878b1 (patch)
tree8269161bff9429bdfde429499c5f2bd5549d6a62 /src/rc/mountinfo.c
parent4ac289b5397a688393c596a9a01651c94d3b5711 (diff)
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/
Diffstat (limited to 'src/rc/mountinfo.c')
-rw-r--r--src/rc/mountinfo.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/rc/mountinfo.c b/src/rc/mountinfo.c
index c4515ae7..fbad6af7 100644
--- a/src/rc/mountinfo.c
+++ b/src/rc/mountinfo.c
@@ -39,7 +39,8 @@
# include <sys/statvfs.h>
# define statfs statvfs
# define F_FLAGS f_flag
-#elif defined (__linux__) || defined (__FreeBSD_kernel__) || defined(__GNU__)
+#elif defined (__linux__) || (defined(__FreeBSD_kernel__) && \
+ defined(__GLIBC__)) || defined(__GNU__)
# include <mntent.h>
#endif
@@ -265,7 +266,8 @@ find_mounts(struct args *args)
return list;
}
-#elif defined (__linux__) || defined (__FreeBSD_kernel__)
+#elif defined (__linux__) || (defined (__FreeBSD_kernel__) && \
+ defined(__GLIBC__))
static struct mntent *
getmntfile(const char *file)
{