diff options
author | Mike Frysinger <vapier@gentoo.org> | 2008-02-07 22:10:07 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2008-02-07 22:10:07 +0000 |
commit | 22876c797cdd848b42f98da7c2ae886cc07ca00d (patch) | |
tree | 92a5af04ce8aa8ecc9a8370a6917a9d335000a89 /include | |
parent | b386c1c614a94b847da7d059367bc9d4fcb33f14 (diff) |
only include mntent.h according to HAVE_MNTENT_H and dont define this on OS X
Diffstat (limited to 'include')
-rw-r--r-- | include/libbb.h | 5 | ||||
-rw-r--r-- | include/platform.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/libbb.h b/include/libbb.h index 028116fe1..ccfe1b705 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -17,7 +17,6 @@ #include <errno.h> #include <fcntl.h> #include <inttypes.h> -#include <mntent.h> #include <netdb.h> #include <setjmp.h> #include <signal.h> @@ -46,6 +45,10 @@ #define PATH_MAX 256 #endif +#ifdef HAVE_MNTENT_H +#include <mntent.h> +#endif + #if ENABLE_SELINUX #include <selinux/selinux.h> #include <selinux/context.h> diff --git a/include/platform.h b/include/platform.h index 2daa077af..050338cf3 100644 --- a/include/platform.h +++ b/include/platform.h @@ -146,7 +146,7 @@ typedef int socklen_t; #endif /* ---- Compiler dependent settings ------------------------- */ -#if (defined __digital__ && defined __unix__) +#if (defined __digital__ && defined __unix__) || defined __APPLE__ # undef HAVE_MNTENT_H #else # define HAVE_MNTENT_H 1 |