Fixup to the previous (portability) patch. Linux actually does need

arpa/inet.h rather than netinet/in.h, otherwise we get warnings.

diff --git a/include/inet_common.h b/include/inet_common.h
index f330aa90fd33c15fe70d255fad1874dcf6b071aa..aa883ed3e6905742ba780ed632cab3a1b460224b 100644 (file)
--- 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 0490ee35f59a3c58eb7d6079b61e72589a98cf52..bc3fa59908be126d062ba4bcb5daebb66ad83de0 100644 (file)
--- 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 3f4bedbe8f92604cbd2ff52296cc125a02fb1675..a1991697080971a45c2527812c54565d4720582a 100644 (file)
--- 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)