Update how we detect if libc5 is in use.

 -Erik


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

2 files changed, 3 insertions, 6 deletions

diff --git a/libbb/daemon.c b/libbb/daemon.c
index 55a776ce0..6d4169ed5 100644
--- a/libbb/daemon.c
+++ b/libbb/daemon.c
@@ -32,9 +32,7 @@
 #include <unistd.h>
 
 
-/* Stupid libc doesn't have a reliable way for use to know 
- * that libc5 is being used.   Assume this is good enough */ 
-#if ! defined __GLIBC__ && ! defined __UCLIBC__
+#if __GNU_LIBRARY__ < 5
 
 int daemon( int nochdir, int noclose )
 {
diff --git a/libbb/libbb.h b/libbb/libbb.h
index 0001cac6f..6133b19d3 100644
--- a/libbb/libbb.h
+++ b/libbb/libbb.h
@@ -34,9 +34,8 @@
 #endif
 
 #include <features.h>
-/* Stupid libc doesn't have a reliable way for use to know 
- * that libc5 is being used.   Assume this is good enough */ 
-#if ! defined __GLIBC__ && ! defined __UCLIBC__
+
+#if __GNU_LIBRARY__ < 5
 /* libc5 doesn't define socklen_t */
 typedef unsigned int socklen_t;
 /* libc5 doesn't implement BSD 4.4 daemon() */