svn commit: trunk/busybox/include

landley at busybox.net landley at busybox.net
Thu Mar 9 22:39:09 UTC 2006


Author: landley
Date: 2006-03-09 14:39:08 -0800 (Thu, 09 Mar 2006)
New Revision: 14499

Log:
Fixup to the previous (portability) patch.  Linux actually does need
arpa/inet.h rather than netinet/in.h, otherwise we get warnings.


Modified:
   trunk/busybox/include/inet_common.h
   trunk/busybox/include/libbb.h
   trunk/busybox/include/platform.h


Changeset:
Modified: trunk/busybox/include/inet_common.h
===================================================================
--- trunk/busybox/include/inet_common.h	2006-03-09 22:21:20 UTC (rev 14498)
+++ trunk/busybox/include/inet_common.h	2006-03-09 22:39:08 UTC (rev 14499)
@@ -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" */

Modified: trunk/busybox/include/libbb.h
===================================================================
--- trunk/busybox/include/libbb.h	2006-03-09 22:21:20 UTC (rev 14498)
+++ trunk/busybox/include/libbb.h	2006-03-09 22:39:08 UTC (rev 14499)
@@ -20,7 +20,6 @@
 #include <stdint.h>
 
 #include <netdb.h>
-#include <netinet/in.h>
 
 #include <features.h>
 

Modified: trunk/busybox/include/platform.h
===================================================================
--- trunk/busybox/include/platform.h	2006-03-09 22:21:20 UTC (rev 14498)
+++ trunk/busybox/include/platform.h	2006-03-09 22:39:08 UTC (rev 14499)
@@ -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)
 




More information about the busybox-cvs mailing list