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 /util-linux | |
| 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 'util-linux')
| -rw-r--r-- | util-linux/dmesg.c | 9 | ||||
| -rw-r--r-- | util-linux/swaponoff.c | 7 |
2 files changed, 1 insertions, 15 deletions
diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c index 6e0d6947f..0c0d2d7c0 100644 --- a/util-linux/dmesg.c +++ b/util-linux/dmesg.c | |||
| @@ -22,14 +22,7 @@ | |||
| 22 | #include <stdlib.h> | 22 | #include <stdlib.h> |
| 23 | #include <getopt.h> | 23 | #include <getopt.h> |
| 24 | #include <errno.h> | 24 | #include <errno.h> |
| 25 | 25 | #include <sys/klog.h> | |
| 26 | #if __GNU_LIBRARY__ < 5 | ||
| 27 | # ifdef __alpha__ | ||
| 28 | # define klogctl syslog | ||
| 29 | # endif | ||
| 30 | #else | ||
| 31 | # include <sys/klog.h> | ||
| 32 | #endif | ||
| 33 | 26 | ||
| 34 | #include "busybox.h" | 27 | #include "busybox.h" |
| 35 | 28 | ||
diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c index 1f3e930a1..9da70756e 100644 --- a/util-linux/swaponoff.c +++ b/util-linux/swaponoff.c | |||
| @@ -28,14 +28,7 @@ | |||
| 28 | #include <string.h> | 28 | #include <string.h> |
| 29 | #include <stdlib.h> | 29 | #include <stdlib.h> |
| 30 | #include <sys/mount.h> | 30 | #include <sys/mount.h> |
| 31 | |||
| 32 | #if __GNU_LIBRARY__ < 5 | ||
| 33 | /* libc5 doesn't have sys/swap.h, define these here. */ | ||
| 34 | extern int swapon (__const char *__path, int __flags); | ||
| 35 | extern int swapoff (__const char *__path); | ||
| 36 | #else | ||
| 37 | #include <sys/swap.h> | 31 | #include <sys/swap.h> |
| 38 | #endif | ||
| 39 | 32 | ||
| 40 | #include "busybox.h" | 33 | #include "busybox.h" |
| 41 | 34 | ||