aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-02-07 22:10:07 +0000
committerMike Frysinger <vapier@gentoo.org>2008-02-07 22:10:07 +0000
commit22876c797cdd848b42f98da7c2ae886cc07ca00d (patch)
tree92a5af04ce8aa8ecc9a8370a6917a9d335000a89
parentb386c1c614a94b847da7d059367bc9d4fcb33f14 (diff)
downloadbusybox-w32-22876c797cdd848b42f98da7c2ae886cc07ca00d.tar.gz
busybox-w32-22876c797cdd848b42f98da7c2ae886cc07ca00d.tar.bz2
busybox-w32-22876c797cdd848b42f98da7c2ae886cc07ca00d.zip
only include mntent.h according to HAVE_MNTENT_H and dont define this on OS X
-rw-r--r--include/libbb.h5
-rw-r--r--include/platform.h2
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 @@
17#include <errno.h> 17#include <errno.h>
18#include <fcntl.h> 18#include <fcntl.h>
19#include <inttypes.h> 19#include <inttypes.h>
20#include <mntent.h>
21#include <netdb.h> 20#include <netdb.h>
22#include <setjmp.h> 21#include <setjmp.h>
23#include <signal.h> 22#include <signal.h>
@@ -46,6 +45,10 @@
46#define PATH_MAX 256 45#define PATH_MAX 256
47#endif 46#endif
48 47
48#ifdef HAVE_MNTENT_H
49#include <mntent.h>
50#endif
51
49#if ENABLE_SELINUX 52#if ENABLE_SELINUX
50#include <selinux/selinux.h> 53#include <selinux/selinux.h>
51#include <selinux/context.h> 54#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;
146#endif 146#endif
147 147
148/* ---- Compiler dependent settings ------------------------- */ 148/* ---- Compiler dependent settings ------------------------- */
149#if (defined __digital__ && defined __unix__) 149#if (defined __digital__ && defined __unix__) || defined __APPLE__
150# undef HAVE_MNTENT_H 150# undef HAVE_MNTENT_H
151#else 151#else
152# define HAVE_MNTENT_H 1 152# define HAVE_MNTENT_H 1