summaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorEric Andersen2001-04-09 23:52:18 +0000
committerEric Andersen2001-04-09 23:52:18 +0000
commitb6b519b416189202d18d888d61d8bbe50dc30325 (patch)
treee04e4a2329b9cf5c96b31fa064e6c85dfb8b9055 /libbb
parentd3f97f19718fa5890cb6cb3fd010f7b4a7bd3ae1 (diff)
downloadbusybox-b6b519b416189202d18d888d61d8bbe50dc30325.zip
busybox-b6b519b416189202d18d888d61d8bbe50dc30325.tar.gz
Update how we detect if libc5 is in use.
-Erik
Diffstat (limited to 'libbb')
-rw-r--r--libbb/daemon.c4
-rw-r--r--libbb/libbb.h5
2 files changed, 3 insertions, 6 deletions
diff --git a/libbb/daemon.c b/libbb/daemon.c
index 55a776c..6d4169e 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 0001cac..6133b19 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() */