From c319601db5296e9d26c7ce0738c4507b51958dda Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Wed, 14 Mar 2001 01:15:06 +0000 Subject: [PATCH] Some updates for libc5 --- busybox.h | 8 ++++++++ include/busybox.h | 8 ++++++++ klogd.c | 1 - logread.c | 10 +++++++++- sysklogd/klogd.c | 1 - sysklogd/logread.c | 10 +++++++++- 6 files changed, 34 insertions(+), 4 deletions(-) diff --git a/busybox.h b/busybox.h index 7ae648501..977fe33ec 100644 --- a/busybox.h +++ b/busybox.h @@ -35,6 +35,14 @@ #include "dmalloc.h" #endif +/* 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__ +/* libc5 doesn't define socklen_t */ +typedef unsigned int socklen_t; +#endif + + /* Some useful definitions */ #define FALSE ((int) 0) #define TRUE ((int) 1) diff --git a/include/busybox.h b/include/busybox.h index 7ae648501..977fe33ec 100644 --- a/include/busybox.h +++ b/include/busybox.h @@ -35,6 +35,14 @@ #include "dmalloc.h" #endif +/* 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__ +/* libc5 doesn't define socklen_t */ +typedef unsigned int socklen_t; +#endif + + /* Some useful definitions */ #define FALSE ((int) 0) #define TRUE ((int) 1) diff --git a/klogd.c b/klogd.c index 7f7d6a142..d5e330bdf 100644 --- a/klogd.c +++ b/klogd.c @@ -43,7 +43,6 @@ #if ! defined __GLIBC__ && ! defined __UCLIBC__ #include #include -typedef unsigned int socklen_t; #ifndef __alpha__ # define __NR_klogctl __NR_syslog diff --git a/logread.c b/logread.c index 66054e601..85c1e2456 100644 --- a/logread.c +++ b/logread.c @@ -23,6 +23,15 @@ * */ + +/* 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__ +#error Sorry. Looks like you are using libc5. +#error libc5 shm support isn't good enough. +#error Please disable BB_FEATURE_IPC_SYSLOG +#endif + #include #include #include @@ -134,4 +143,3 @@ static void error_exit(const char *str){ exit(1); } - diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c index 7f7d6a142..d5e330bdf 100644 --- a/sysklogd/klogd.c +++ b/sysklogd/klogd.c @@ -43,7 +43,6 @@ #if ! defined __GLIBC__ && ! defined __UCLIBC__ #include #include -typedef unsigned int socklen_t; #ifndef __alpha__ # define __NR_klogctl __NR_syslog diff --git a/sysklogd/logread.c b/sysklogd/logread.c index 66054e601..85c1e2456 100644 --- a/sysklogd/logread.c +++ b/sysklogd/logread.c @@ -23,6 +23,15 @@ * */ + +/* 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__ +#error Sorry. Looks like you are using libc5. +#error libc5 shm support isn't good enough. +#error Please disable BB_FEATURE_IPC_SYSLOG +#endif + #include #include #include @@ -134,4 +143,3 @@ static void error_exit(const char *str){ exit(1); } - -- 2.25.1