diff options
| author | landley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-03-09 22:39:08 +0000 |
|---|---|---|
| committer | landley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-03-09 22:39:08 +0000 |
| commit | 8ee3984df387bf31ba1d652a861d7fedbac7bfa8 (patch) | |
| tree | 89d64a7f3656c01ec09a1e00b4878fc3a7b2b7ba /include | |
| parent | 0b5b84349d2c73b73cc93ba6bea3b3f187b65e77 (diff) | |
| download | busybox-w32-8ee3984df387bf31ba1d652a861d7fedbac7bfa8.tar.gz busybox-w32-8ee3984df387bf31ba1d652a861d7fedbac7bfa8.tar.bz2 busybox-w32-8ee3984df387bf31ba1d652a861d7fedbac7bfa8.zip | |
Fixup to the previous (portability) patch. Linux actually does need
arpa/inet.h rather than netinet/in.h, otherwise we get warnings.
git-svn-id: svn://busybox.net/trunk/busybox@14499 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'include')
| -rw-r--r-- | include/inet_common.h | 2 | ||||
| -rw-r--r-- | include/libbb.h | 1 | ||||
| -rw-r--r-- | 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 @@ | |||
| 11 | #include <features.h> | 11 | #include <features.h> |
| 12 | #include <sys/types.h> | 12 | #include <sys/types.h> |
| 13 | #include <sys/socket.h> | 13 | #include <sys/socket.h> |
| 14 | #include <netinet/in.h> | 14 | #include "platform.h" |
| 15 | 15 | ||
| 16 | 16 | ||
| 17 | extern const char bb_INET_default[]; /* = "default" */ | 17 | 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 @@ | |||
| 20 | #include <stdint.h> | 20 | #include <stdint.h> |
| 21 | 21 | ||
| 22 | #include <netdb.h> | 22 | #include <netdb.h> |
| 23 | #include <netinet/in.h> | ||
| 24 | 23 | ||
| 25 | #include <features.h> | 24 | #include <features.h> |
| 26 | 25 | ||
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 @@ | |||
| 92 | #define BB_BIG_ENDIAN 0 | 92 | #define BB_BIG_ENDIAN 0 |
| 93 | #endif | 93 | #endif |
| 94 | 94 | ||
| 95 | /* ---- Networking ------------------------------------------ */ | ||
| 96 | #ifndef __APPLE__ | ||
| 97 | #include <arpa/inet.h> | ||
| 98 | #else | ||
| 99 | #include <netinet/in.h> | ||
| 100 | #endif | ||
| 101 | |||
| 95 | /* ---- miscellaneous --------------------------------------- */ | 102 | /* ---- miscellaneous --------------------------------------- */ |
| 96 | /* NLS stuff */ | 103 | /* NLS stuff */ |
| 104 | /* THIS SHOULD BE CLEANED OUT OF THE TREE ENTIRELY */ | ||
| 97 | #define _(Text) Text | 105 | #define _(Text) Text |
| 98 | #define N_(Text) (Text) | 106 | #define N_(Text) (Text) |
| 99 | 107 | ||