diff options
| author | Eric Andersen <andersen@codepoet.org> | 2003-07-22 08:56:55 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2003-07-22 08:56:55 +0000 |
| commit | 85e5e72bc1acd9d58c11bde6e14c8270cd9f169f (patch) | |
| tree | 9971c6951256dd0bba5ff2a7db08ed6f65ef218d /sysklogd | |
| parent | 0a14c9f924eaf6a64e78959a190d187d646b3c0c (diff) | |
| download | busybox-w32-85e5e72bc1acd9d58c11bde6e14c8270cd9f169f.tar.gz busybox-w32-85e5e72bc1acd9d58c11bde6e14c8270cd9f169f.tar.bz2 busybox-w32-85e5e72bc1acd9d58c11bde6e14c8270cd9f169f.zip | |
Remove remaining libc5 support code
Diffstat (limited to 'sysklogd')
| -rw-r--r-- | sysklogd/klogd.c | 9 | ||||
| -rw-r--r-- | sysklogd/logread.c | 7 | ||||
| -rw-r--r-- | sysklogd/syslogd.c | 6 |
3 files changed, 1 insertions, 21 deletions
diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c index d32882d33..f537a4bb8 100644 --- a/sysklogd/klogd.c +++ b/sysklogd/klogd.c | |||
| @@ -38,14 +38,7 @@ | |||
| 38 | #include <unistd.h> | 38 | #include <unistd.h> |
| 39 | #include <ctype.h> | 39 | #include <ctype.h> |
| 40 | #include <sys/syslog.h> | 40 | #include <sys/syslog.h> |
| 41 | 41 | #include <sys/klog.h> | |
| 42 | #if __GNU_LIBRARY__ < 5 | ||
| 43 | # ifdef __alpha__ | ||
| 44 | # define klogctl syslog | ||
| 45 | # endif | ||
| 46 | #else | ||
| 47 | # include <sys/klog.h> | ||
| 48 | #endif | ||
| 49 | 42 | ||
| 50 | #include "busybox.h" | 43 | #include "busybox.h" |
| 51 | 44 | ||
diff --git a/sysklogd/logread.c b/sysklogd/logread.c index ae8dbae3a..2692efbee 100644 --- a/sysklogd/logread.c +++ b/sysklogd/logread.c | |||
| @@ -35,13 +35,6 @@ | |||
| 35 | #include <setjmp.h> | 35 | #include <setjmp.h> |
| 36 | #include "busybox.h" | 36 | #include "busybox.h" |
| 37 | 37 | ||
| 38 | #if __GNU_LIBRARY__ < 5 | ||
| 39 | #error Sorry. Looks like you are using libc5. | ||
| 40 | #error libc5 shm support isnt good enough. | ||
| 41 | #error Please disable CONFIG_FEATURE_IPC_SYSLOG | ||
| 42 | #endif | ||
| 43 | |||
| 44 | |||
| 45 | static const long KEY_ID = 0x414e4547; /*"GENA"*/ | 38 | static const long KEY_ID = 0x414e4547; /*"GENA"*/ |
| 46 | 39 | ||
| 47 | static struct shbuf_ds { | 40 | static struct shbuf_ds { |
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c index 06dfca6d8..89f8d60ca 100644 --- a/sysklogd/syslogd.c +++ b/sysklogd/syslogd.c | |||
| @@ -86,12 +86,6 @@ static int local_logging = FALSE; | |||
| 86 | 86 | ||
| 87 | /* circular buffer variables/structures */ | 87 | /* circular buffer variables/structures */ |
| 88 | #ifdef CONFIG_FEATURE_IPC_SYSLOG | 88 | #ifdef CONFIG_FEATURE_IPC_SYSLOG |
| 89 | #if __GNU_LIBRARY__ < 5 | ||
| 90 | #error Sorry. Looks like you are using libc5. | ||
| 91 | #error libc5 shm support isnt good enough. | ||
| 92 | #error Please disable CONFIG_FEATURE_IPC_SYSLOG | ||
| 93 | #endif | ||
| 94 | |||
| 95 | #include <sys/ipc.h> | 89 | #include <sys/ipc.h> |
| 96 | #include <sys/sem.h> | 90 | #include <sys/sem.h> |
| 97 | #include <sys/shm.h> | 91 | #include <sys/shm.h> |