diff options
| author | LaMont Jones <lamont@debian.org> | 2010-08-02 23:02:28 -0600 |
|---|---|---|
| committer | LaMont Jones <lamont@debian.org> | 2010-08-02 23:02:28 -0600 |
| commit | 0864d694ca05ea9383ef09bc1bc3a182e15e2ffa (patch) | |
| tree | 2e5237f1d4e2cac2efad97ce31abc386c1e37b6d /lib/ismounted.c | |
| parent | 3cbdfd84fde6159d7778e70618fbbc8df219cafe (diff) | |
| parent | 6c91f5e3e1de32c45ea0b38227ce35eb43eb2ebc (diff) | |
| download | util-linux-old-0864d694ca05ea9383ef09bc1bc3a182e15e2ffa.tar.gz | |
Merge remote branch 'origin/master'
Conflicts:
mount/Makefile.am
sys-utils/ipcs.c
tests/ts/blkid/images-fs/befs.img.bz2
tests/ts/blkid/images-fs/ddf-raid.img.bz2
Diffstat (limited to 'lib/ismounted.c')
| -rw-r--r-- | lib/ismounted.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/ismounted.c b/lib/ismounted.c index 94fe425c..592df308 100644 --- a/lib/ismounted.c +++ b/lib/ismounted.c @@ -11,14 +11,21 @@ #include <stdlib.h> #include <errno.h> #include <fcntl.h> +#if HAVE_MNTENT_H #include <mntent.h> +#endif #include <string.h> #include <sys/stat.h> #include <ctype.h> #include <sys/param.h> +#ifdef __APPLE__ +#include <sys/ucred.h> +#include <sys/mount.h> +#endif #include "pathnames.h" #include "ismounted.h" +#include "c.h" #ifdef HAVE_MNTENT_H /* |