diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-12-18 21:49:06 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-12-18 21:49:06 +0000 |
| commit | 83e5d6f77237b64853c194b0ce592e77ef677c4d (patch) | |
| tree | 84b352ca012bd713d990ef1d90b47777a6f6e2e7 /networking | |
| parent | f42ff90453687624874c1eb8cc53f68514f7cb34 (diff) | |
| download | busybox-w32-83e5d6f77237b64853c194b0ce592e77ef677c4d.tar.gz busybox-w32-83e5d6f77237b64853c194b0ce592e77ef677c4d.tar.bz2 busybox-w32-83e5d6f77237b64853c194b0ce592e77ef677c4d.zip | |
A bunch of defined(__GLIBC__) added. static-linking warning expanded
Diffstat (limited to 'networking')
| -rw-r--r-- | networking/ifconfig.c | 2 | ||||
| -rw-r--r-- | networking/interface.c | 2 | ||||
| -rw-r--r-- | networking/libiproute/ll_proto.c | 3 | ||||
| -rw-r--r-- | networking/udhcp/clientpacket.c | 2 | ||||
| -rw-r--r-- | networking/udhcp/clientsocket.c | 2 | ||||
| -rw-r--r-- | networking/udhcp/packet.c | 2 | ||||
| -rw-r--r-- | networking/udhcp/socket.c | 2 |
7 files changed, 7 insertions, 8 deletions
diff --git a/networking/ifconfig.c b/networking/ifconfig.c index ae5b468ce..242bd0638 100644 --- a/networking/ifconfig.c +++ b/networking/ifconfig.c | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | #include <net/if.h> | 29 | #include <net/if.h> |
| 30 | #include <net/if_arp.h> | 30 | #include <net/if_arp.h> |
| 31 | #include <netinet/in.h> | 31 | #include <netinet/in.h> |
| 32 | #if __GLIBC__ >=2 && __GLIBC_MINOR__ >= 1 | 32 | #if defined(__GLIBC__) && __GLIBC__ >=2 && __GLIBC_MINOR__ >= 1 |
| 33 | #include <netpacket/packet.h> | 33 | #include <netpacket/packet.h> |
| 34 | #include <net/ethernet.h> | 34 | #include <net/ethernet.h> |
| 35 | #else | 35 | #else |
diff --git a/networking/interface.c b/networking/interface.c index dd455823b..1d194f38e 100644 --- a/networking/interface.c +++ b/networking/interface.c | |||
| @@ -741,7 +741,7 @@ static const struct hwtype loop_hwtype = { | |||
| 741 | 741 | ||
| 742 | #include <net/if_arp.h> | 742 | #include <net/if_arp.h> |
| 743 | 743 | ||
| 744 | #if (__GLIBC__ >=2 && __GLIBC_MINOR__ >= 1) || defined(_NEWLIB_VERSION) | 744 | #if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined(_NEWLIB_VERSION) |
| 745 | #include <net/ethernet.h> | 745 | #include <net/ethernet.h> |
| 746 | #else | 746 | #else |
| 747 | #include <linux/if_ether.h> | 747 | #include <linux/if_ether.h> |
diff --git a/networking/libiproute/ll_proto.c b/networking/libiproute/ll_proto.c index a3fe9d376..20f26ca3f 100644 --- a/networking/libiproute/ll_proto.c +++ b/networking/libiproute/ll_proto.c | |||
| @@ -11,12 +11,11 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include "libbb.h" | 13 | #include "libbb.h" |
| 14 | #include <string.h> | ||
| 15 | 14 | ||
| 16 | #include "rt_names.h" | 15 | #include "rt_names.h" |
| 17 | #include "utils.h" | 16 | #include "utils.h" |
| 18 | 17 | ||
| 19 | #if __GLIBC__ >=2 && __GLIBC_MINOR__ >= 1 | 18 | #if defined(__GLIBC__) && __GLIBC__ >=2 && __GLIBC_MINOR__ >= 1 |
| 20 | #include <net/ethernet.h> | 19 | #include <net/ethernet.h> |
| 21 | #else | 20 | #else |
| 22 | #include <linux/if_ether.h> | 21 | #include <linux/if_ether.h> |
diff --git a/networking/udhcp/clientpacket.c b/networking/udhcp/clientpacket.c index 15cbda2f5..69d7f2d38 100644 --- a/networking/udhcp/clientpacket.c +++ b/networking/udhcp/clientpacket.c | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <features.h> | 11 | #include <features.h> |
| 12 | #if (__GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined _NEWLIB_VERSION | 12 | #if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined _NEWLIB_VERSION |
| 13 | #include <netpacket/packet.h> | 13 | #include <netpacket/packet.h> |
| 14 | #include <net/ethernet.h> | 14 | #include <net/ethernet.h> |
| 15 | #else | 15 | #else |
diff --git a/networking/udhcp/clientsocket.c b/networking/udhcp/clientsocket.c index 852061968..b8803f04e 100644 --- a/networking/udhcp/clientsocket.c +++ b/networking/udhcp/clientsocket.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <features.h> | 24 | #include <features.h> |
| 25 | #if (__GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined(_NEWLIB_VERSION) | 25 | #if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined(_NEWLIB_VERSION) |
| 26 | #include <netpacket/packet.h> | 26 | #include <netpacket/packet.h> |
| 27 | #include <net/ethernet.h> | 27 | #include <net/ethernet.h> |
| 28 | #else | 28 | #else |
diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c index dec9d0ab3..25c55faab 100644 --- a/networking/udhcp/packet.c +++ b/networking/udhcp/packet.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* vi: set sw=4 ts=4: */ | 1 | /* vi: set sw=4 ts=4: */ |
| 2 | 2 | ||
| 3 | #include <netinet/in.h> | 3 | #include <netinet/in.h> |
| 4 | #if (__GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined _NEWLIB_VERSION | 4 | #if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined _NEWLIB_VERSION |
| 5 | #include <netpacket/packet.h> | 5 | #include <netpacket/packet.h> |
| 6 | #include <net/ethernet.h> | 6 | #include <net/ethernet.h> |
| 7 | #else | 7 | #else |
diff --git a/networking/udhcp/socket.c b/networking/udhcp/socket.c index 2bae68f27..9ea200280 100644 --- a/networking/udhcp/socket.c +++ b/networking/udhcp/socket.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | 25 | ||
| 26 | #include <net/if.h> | 26 | #include <net/if.h> |
| 27 | #include <features.h> | 27 | #include <features.h> |
| 28 | #if (__GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined _NEWLIB_VERSION | 28 | #if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined _NEWLIB_VERSION |
| 29 | #include <netpacket/packet.h> | 29 | #include <netpacket/packet.h> |
| 30 | #include <net/ethernet.h> | 30 | #include <net/ethernet.h> |
| 31 | #else | 31 | #else |