diff options
| -rw-r--r-- | busybox.h | 8 | ||||
| -rw-r--r-- | include/busybox.h | 8 | ||||
| -rw-r--r-- | klogd.c | 1 | ||||
| -rw-r--r-- | logread.c | 10 | ||||
| -rw-r--r-- | sysklogd/klogd.c | 1 | ||||
| -rw-r--r-- | sysklogd/logread.c | 10 |
6 files changed, 34 insertions, 4 deletions
@@ -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) @@ -43,7 +43,6 @@ #if ! defined __GLIBC__ && ! defined __UCLIBC__ #include <sys/syscall.h> #include <linux/unistd.h> -typedef unsigned int socklen_t; #ifndef __alpha__ # define __NR_klogctl __NR_syslog @@ -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 <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -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 <sys/syscall.h> #include <linux/unistd.h> -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 <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -134,4 +143,3 @@ static void error_exit(const char *str){ exit(1);
}
-
|