summaryrefslogtreecommitdiff
path: root/sysklogd
diff options
context:
space:
mode:
authorEric Andersen2003-07-22 08:56:55 +0000
committerEric Andersen2003-07-22 08:56:55 +0000
commit85e5e72bc1acd9d58c11bde6e14c8270cd9f169f (patch)
tree9971c6951256dd0bba5ff2a7db08ed6f65ef218d /sysklogd
parent0a14c9f924eaf6a64e78959a190d187d646b3c0c (diff)
downloadbusybox-85e5e72bc1acd9d58c11bde6e14c8270cd9f169f.zip
busybox-85e5e72bc1acd9d58c11bde6e14c8270cd9f169f.tar.gz
Remove remaining libc5 support code
Diffstat (limited to 'sysklogd')
-rw-r--r--sysklogd/klogd.c9
-rw-r--r--sysklogd/logread.c7
-rw-r--r--sysklogd/syslogd.c6
3 files changed, 1 insertions, 21 deletions
diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c
index d32882d..f537a4b 100644
--- a/sysklogd/klogd.c
+++ b/sysklogd/klogd.c
@@ -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"
diff --git a/sysklogd/logread.c b/sysklogd/logread.c
index ae8dbae..2692efb 100644
--- a/sysklogd/logread.c
+++ b/sysklogd/logread.c
@@ -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 {
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index 06dfca6..89f8d60 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -86,12 +86,6 @@ static int local_logging = FALSE;
/* 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>