[BusyBox-cvs] busybox/sysklogd klogd.c, 1.15, 1.16 logread.c, 1.11, 1.12 syslogd.c, 1.97, 1.98

Erik Andersen andersen at busybox.net
Tue Jul 22 08:57:24 UTC 2003


Update of /var/cvs/busybox/sysklogd
In directory winder:/tmp/cvs-serv29080/sysklogd

Modified Files:
	klogd.c logread.c syslogd.c 
Log Message:
Remove remaining libc5 support code


Index: klogd.c
===================================================================
RCS file: /var/cvs/busybox/sysklogd/klogd.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- klogd.c	14 Jul 2003 21:21:06 -0000	1.15
+++ klogd.c	22 Jul 2003 08:56:54 -0000	1.16
@@ -38,14 +38,7 @@
 #include <unistd.h>
 #include <ctype.h>
 #include <sys/syslog.h>
-
-#if __GNU_LIBRARY__ < 5
-# ifdef __alpha__
-#   define klogctl syslog
-# endif
-#else
-# include <sys/klog.h>
-#endif
+#include <sys/klog.h>
 
 #include "busybox.h"
 

Index: logread.c
===================================================================
RCS file: /var/cvs/busybox/sysklogd/logread.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- logread.c	19 Mar 2003 09:12:57 -0000	1.11
+++ logread.c	22 Jul 2003 08:56:54 -0000	1.12
@@ -35,13 +35,6 @@
 #include <setjmp.h>
 #include "busybox.h"
 
-#if __GNU_LIBRARY__ < 5
-#error Sorry.  Looks like you are using libc5.  
-#error libc5 shm support isnt good enough.
-#error Please disable CONFIG_FEATURE_IPC_SYSLOG 
-#endif	
-
-
 static const long KEY_ID = 0x414e4547; /*"GENA"*/
 
 static struct shbuf_ds {

Index: syslogd.c
===================================================================
RCS file: /var/cvs/busybox/sysklogd/syslogd.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- syslogd.c	14 Jul 2003 21:21:06 -0000	1.97
+++ syslogd.c	22 Jul 2003 08:56:54 -0000	1.98
@@ -86,12 +86,6 @@
 
 /* circular buffer variables/structures */
 #ifdef CONFIG_FEATURE_IPC_SYSLOG
-#if __GNU_LIBRARY__ < 5
-#error Sorry.  Looks like you are using libc5.
-#error libc5 shm support isnt good enough.
-#error Please disable CONFIG_FEATURE_IPC_SYSLOG
-#endif
-
 #include <sys/ipc.h>
 #include <sys/sem.h>
 #include <sys/shm.h>




More information about the busybox-cvs mailing list