diff options
| author | Denis Vlasenko | 2006-12-18 21:49:06 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2006-12-18 21:49:06 +0000 |
| commit | 83e5d6f77237b64853c194b0ce592e77ef677c4d (patch) | |
| tree | 84b352ca012bd713d990ef1d90b47777a6f6e2e7 /networking | |
| parent | f42ff90453687624874c1eb8cc53f68514f7cb34 (diff) | |
| download | busybox-83e5d6f77237b64853c194b0ce592e77ef677c4d.zip busybox-83e5d6f77237b64853c194b0ce592e77ef677c4d.tar.gz | |
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 ae5b468..242bd06 100644 --- a/networking/ifconfig.c +++ b/networking/ifconfig.c @@ -29,7 +29,7 @@ #include <net/if.h> #include <net/if_arp.h> #include <netinet/in.h> -#if __GLIBC__ >=2 && __GLIBC_MINOR__ >= 1 +#if defined(__GLIBC__) && __GLIBC__ >=2 && __GLIBC_MINOR__ >= 1 #include <netpacket/packet.h> #include <net/ethernet.h> #else diff --git a/networking/interface.c b/networking/interface.c index dd45582..1d194f3 100644 --- a/networking/interface.c +++ b/networking/interface.c @@ -741,7 +741,7 @@ static const struct hwtype loop_hwtype = { #include <net/if_arp.h> -#if (__GLIBC__ >=2 && __GLIBC_MINOR__ >= 1) || defined(_NEWLIB_VERSION) +#if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined(_NEWLIB_VERSION) #include <net/ethernet.h> #else #include <linux/if_ether.h> diff --git a/networking/libiproute/ll_proto.c b/networking/libiproute/ll_proto.c index a3fe9d3..20f26ca 100644 --- a/networking/libiproute/ll_proto.c +++ b/networking/libiproute/ll_proto.c @@ -11,12 +11,11 @@ */ #include "libbb.h" -#include <string.h> #include "rt_names.h" #include "utils.h" -#if __GLIBC__ >=2 && __GLIBC_MINOR__ >= 1 +#if defined(__GLIBC__) && __GLIBC__ >=2 && __GLIBC_MINOR__ >= 1 #include <net/ethernet.h> #else #include <linux/if_ether.h> diff --git a/networking/udhcp/clientpacket.c b/networking/udhcp/clientpacket.c index 15cbda2..69d7f2d 100644 --- a/networking/udhcp/clientpacket.c +++ b/networking/udhcp/clientpacket.c @@ -9,7 +9,7 @@ */ #include <features.h> -#if (__GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined _NEWLIB_VERSION +#if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined _NEWLIB_VERSION #include <netpacket/packet.h> #include <net/ethernet.h> #else diff --git a/networking/udhcp/clientsocket.c b/networking/udhcp/clientsocket.c index 8520619..b8803f0 100644 --- a/networking/udhcp/clientsocket.c +++ b/networking/udhcp/clientsocket.c @@ -22,7 +22,7 @@ */ #include <features.h> -#if (__GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined(_NEWLIB_VERSION) +#if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined(_NEWLIB_VERSION) #include <netpacket/packet.h> #include <net/ethernet.h> #else diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c index dec9d0a..25c55fa 100644 --- a/networking/udhcp/packet.c +++ b/networking/udhcp/packet.c @@ -1,7 +1,7 @@ /* vi: set sw=4 ts=4: */ #include <netinet/in.h> -#if (__GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined _NEWLIB_VERSION +#if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined _NEWLIB_VERSION #include <netpacket/packet.h> #include <net/ethernet.h> #else diff --git a/networking/udhcp/socket.c b/networking/udhcp/socket.c index 2bae68f..9ea2002 100644 --- a/networking/udhcp/socket.c +++ b/networking/udhcp/socket.c @@ -25,7 +25,7 @@ #include <net/if.h> #include <features.h> -#if (__GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined _NEWLIB_VERSION +#if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined _NEWLIB_VERSION #include <netpacket/packet.h> #include <net/ethernet.h> #else |