From dae6aa28598cb2353291f18ca52e768c3259165a Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Thu, 9 Mar 2006 22:39:08 +0000 Subject: [PATCH] Fixup to the previous (portability) patch. Linux actually does need arpa/inet.h rather than netinet/in.h, otherwise we get warnings. --- include/inet_common.h | 2 +- include/libbb.h | 1 - include/platform.h | 8 ++++++++ 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 #include #include -#include +#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 #include -#include #include 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 +#else +#include +#endif + /* ---- miscellaneous --------------------------------------- */ /* NLS stuff */ +/* THIS SHOULD BE CLEANED OUT OF THE TREE ENTIRELY */ #define _(Text) Text #define N_(Text) (Text)