A bunch of defined(__GLIBC__) added. static-linking warning expanded

git-svn-id: svn://busybox.net/trunk/busybox@16996 69ca8d6d-28ef-0310-b511-8ec308f3f277

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 @@
 #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 dd455823b..1d194f38e 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 a3fe9d376..20f26ca3f 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 15cbda2f5..69d7f2d38 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 852061968..b8803f04e 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 dec9d0ab3..25c55faab 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 2bae68f27..9ea200280 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