From: Ruediger Meier <ruediger.meier@ga-group.nl>
Date: Wed, 17 Feb 2016 22:28:52 +0000 (+0100)
Subject: lib: fix ismounted includes for FreeBSD
X-Git-Tag: v2.28-rc1~85^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac1c53e4519007955c6b51e1e87620a86e8f7f53;p=thirdparty%2Futil-linux.git

lib: fix ismounted includes for FreeBSD

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---

diff --git a/configure.ac b/configure.ac
index 535df03fb0..227ba253f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -237,6 +237,7 @@ AC_CHECK_HEADERS([ \
 	sys/ioccom.h \
 	sys/ioctl.h \
 	sys/mkdev.h \
+	sys/mount.h \
 	sys/param.h \
 	sys/prctl.h \
 	sys/queue.h \
@@ -251,6 +252,7 @@ AC_CHECK_HEADERS([ \
 	sys/timex.h \
 	sys/ttydefaults.h \
 	sys/types.h \
+	sys/ucred.h \
 	sys/un.h \
 	unistd.h \
 ])
diff --git a/lib/ismounted.c b/lib/ismounted.c
index 90952905d0..f83be65e09 100644
--- a/lib/ismounted.c
+++ b/lib/ismounted.c
@@ -18,9 +18,14 @@
 #include <sys/stat.h>
 #include <ctype.h>
 #include <sys/param.h>
-#ifdef __APPLE__
-#include <sys/ucred.h>
-#include <sys/mount.h>
+
+#ifndef __linux__
+# ifdef HAVE_SYS_UCRED_H
+#  include <sys/ucred.h>
+# endif
+# ifdef HAVE_SYS_MOUNT_H
+#  include <sys/mount.h>
+# endif
 #endif
 
 #include "pathnames.h"