Merge 'baserock/richardmaw/yakshave/util-linux-blkid' into baserock/morphbaserock/morph

Reviewed-by: Lars Wirzenius
Reviewed-by: Sam Thursfield

1 files changed, 4 insertions, 2 deletions

diff --git a/misc/ismounted.c b/misc/ismounted.c
index 9e8bebfd..6aa0e04d 100644
--- a/misc/ismounted.c
+++ b/misc/ismounted.c
@@ -40,6 +40,7 @@
 
 #include "et/com_err.h"
 
+#ifdef HAVE_SETMNTENT
 static char *skip_over_blank(char *cp)
 {
 	while (*cp && isspace(*cp))
@@ -69,6 +70,7 @@ static char *parse_word(char **buf)
 	*buf = next;
 	return word;
 }
+#endif
 
 /*
  * Helper function which checks a file in /etc/mtab format to see if a
@@ -78,7 +80,7 @@ static char *parse_word(char **buf)
 static errcode_t check_mntent_file(const char *mtab_file, const char *file,
 				   int *mount_flags)
 {
-#ifdef HAVE_MNTENT_H
+#ifdef HAVE_SETMNTENT
 	struct stat	st_buf;
 	errcode_t	retval = 0;
 	dev_t		file_dev=0, file_rdev=0;
@@ -178,7 +180,7 @@ static errcode_t check_mntent_file(const char *mtab_file, const char *file,
 errout:
 	endmntent (f);
 	return retval;
-#else /* !HAVE_MNTENT_H */
+#else /* !HAVE_SETMNTENT */
 	return 0;
 #endif /* HAVE_MNTENT_H */
 }