diff options
| author | Eric Andersen <andersen@codepoet.org> | 2001-04-09 23:52:18 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2001-04-09 23:52:18 +0000 |
| commit | b6b519b416189202d18d888d61d8bbe50dc30325 (patch) | |
| tree | e04e4a2329b9cf5c96b31fa064e6c85dfb8b9055 /libbb | |
| parent | d3f97f19718fa5890cb6cb3fd010f7b4a7bd3ae1 (diff) | |
| download | busybox-w32-b6b519b416189202d18d888d61d8bbe50dc30325.tar.gz busybox-w32-b6b519b416189202d18d888d61d8bbe50dc30325.tar.bz2 busybox-w32-b6b519b416189202d18d888d61d8bbe50dc30325.zip | |
Update how we detect if libc5 is in use.
-Erik
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/daemon.c | 4 | ||||
| -rw-r--r-- | libbb/libbb.h | 5 |
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 @@ | |||
| 32 | #include <unistd.h> | 32 | #include <unistd.h> |
| 33 | 33 | ||
| 34 | 34 | ||
| 35 | /* Stupid libc doesn't have a reliable way for use to know | 35 | #if __GNU_LIBRARY__ < 5 |
| 36 | * that libc5 is being used. Assume this is good enough */ | ||
| 37 | #if ! defined __GLIBC__ && ! defined __UCLIBC__ | ||
| 38 | 36 | ||
| 39 | int daemon( int nochdir, int noclose ) | 37 | int daemon( int nochdir, int noclose ) |
| 40 | { | 38 | { |
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 @@ | |||
| 34 | #endif | 34 | #endif |
| 35 | 35 | ||
| 36 | #include <features.h> | 36 | #include <features.h> |
| 37 | /* Stupid libc doesn't have a reliable way for use to know | 37 | |
| 38 | * that libc5 is being used. Assume this is good enough */ | 38 | #if __GNU_LIBRARY__ < 5 |
| 39 | #if ! defined __GLIBC__ && ! defined __UCLIBC__ | ||
| 40 | /* libc5 doesn't define socklen_t */ | 39 | /* libc5 doesn't define socklen_t */ |
| 41 | typedef unsigned int socklen_t; | 40 | typedef unsigned int socklen_t; |
| 42 | /* libc5 doesn't implement BSD 4.4 daemon() */ | 41 | /* libc5 doesn't implement BSD 4.4 daemon() */ |