aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGravatar Rob Landley <rob@landley.net>2006-03-09 22:39:08 +0000
committerGravatar Rob Landley <rob@landley.net>2006-03-09 22:39:08 +0000
commitdae6aa28598cb2353291f18ca52e768c3259165a (patch)
tree89d64a7f3656c01ec09a1e00b4878fc3a7b2b7ba /include
parent1f305dc0fdb8415c9c1321e49cc194089e58c456 (diff)
downloadbusybox-dae6aa28598cb2353291f18ca52e768c3259165a.tar.gz
busybox-dae6aa28598cb2353291f18ca52e768c3259165a.tar.bz2
Fixup to the previous (portability) patch. Linux actually does need
arpa/inet.h rather than netinet/in.h, otherwise we get warnings.
Diffstat (limited to 'include')
-rw-r--r--include/inet_common.h2
-rw-r--r--include/libbb.h1
-rw-r--r--include/platform.h8
3 files changed, 9 insertions, 2 deletions
diff --git a/include/inet_common.h b/include/inet_common.h
index f330aa90f..aa883ed3e 100644
--- a/include/inet_common.h
+++ b/include/inet_common.h
@@ -11,7 +11,7 @@
#include <features.h>
#include <sys/types.h>
#include <sys/socket.h>
-#include <netinet/in.h>
+#include "platform.h"
extern const char bb_INET_default[]; /* = "default" */
diff --git a/include/libbb.h b/include/libbb.h
index 0490ee35f..bc3fa5990 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -20,7 +20,6 @@
#include <stdint.h>
#include <netdb.h>
-#include <netinet/in.h>
#include <features.h>
diff --git a/include/platform.h b/include/platform.h
index 3f4bedbe8..a19916970 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -92,8 +92,16 @@
#define BB_BIG_ENDIAN 0
#endif
+/* ---- Networking ------------------------------------------ */
+#ifndef __APPLE__
+#include <arpa/inet.h>
+#else
+#include <netinet/in.h>
+#endif
+
/* ---- miscellaneous --------------------------------------- */
/* NLS stuff */
+/* THIS SHOULD BE CLEANED OUT OF THE TREE ENTIRELY */
#define _(Text) Text
#define N_(Text) (Text)