Some updates for libc5

diff --git a/busybox.h b/busybox.h
index 7ae64850190b96599ef7d6b591120647732ec50a..977fe33ec321b7867a8deea54b000de03773e531 100644 (file)
--- 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 7ae64850190b96599ef7d6b591120647732ec50a..977fe33ec321b7867a8deea54b000de03773e531 100644 (file)
--- 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 7f7d6a142c3236407bfd1ef9f0c1ab3f6af09bb0..d5e330bdf75855098f0db48ff53c3e7ab57ca885 100644 (file)
--- a/klogd.c
+++ b/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/logread.c b/logread.c
index 66054e60141d6ae7c6d5f8b283ef1d1d0125e7c0..85c1e24565958b732f6b1e1e3c3fb1fe5d0d967c 100644 (file)
--- a/logread.c
+++ b/logread.c
@@ -23,6 +23,15 @@
  *\r
  */\r
 \r
+\r
+/* Stupid libc doesn't have a reliable way for use to know \r
+ * that libc5 is being used.   Assume this is good enough */ \r
+#if defined __GLIBC__ || defined __UCLIBC__\r
+#error Sorry.  Looks like you are using libc5.  \r
+#error libc5 shm support isn't good enough.\r
+#error Please disable BB_FEATURE_IPC_SYSLOG \r
+#endif \r
+\r
 #include <stdio.h>\r
 #include <stdlib.h>\r
 #include <string.h>\r
@@ -134,4 +143,3 @@ static void error_exit(const char *str){
 \r
        exit(1);\r
 }\r
-\r

diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c
index 7f7d6a142c3236407bfd1ef9f0c1ab3f6af09bb0..d5e330bdf75855098f0db48ff53c3e7ab57ca885 100644 (file)
--- 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 66054e60141d6ae7c6d5f8b283ef1d1d0125e7c0..85c1e24565958b732f6b1e1e3c3fb1fe5d0d967c 100644 (file)
--- a/sysklogd/logread.c
+++ b/sysklogd/logread.c
@@ -23,6 +23,15 @@
  *\r
  */\r
 \r
+\r
+/* Stupid libc doesn't have a reliable way for use to know \r
+ * that libc5 is being used.   Assume this is good enough */ \r
+#if defined __GLIBC__ || defined __UCLIBC__\r
+#error Sorry.  Looks like you are using libc5.  \r
+#error libc5 shm support isn't good enough.\r
+#error Please disable BB_FEATURE_IPC_SYSLOG \r
+#endif \r
+\r
 #include <stdio.h>\r
 #include <stdlib.h>\r
 #include <string.h>\r
@@ -134,4 +143,3 @@ static void error_exit(const char *str){
 \r
        exit(1);\r
 }\r
-\r