diff options
author | Eric Andersen <andersen@codepoet.org> | 2000-07-06 09:56:35 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2000-07-06 09:56:35 +0000 |
commit | 1e03add675c58c17d96f51cafa008066d4220a09 (patch) | |
tree | 707976ee4be91a365342b34d8069e6c9e0f089bf | |
parent | 5d893b6beb2a42c6c3bc0fd0b5447bcfc8a0f84c (diff) | |
download | busybox-w32-1e03add675c58c17d96f51cafa008066d4220a09.tar.gz busybox-w32-1e03add675c58c17d96f51cafa008066d4220a09.tar.bz2 busybox-w32-1e03add675c58c17d96f51cafa008066d4220a09.zip |
a few minor cleanups.
-Erik
-rw-r--r-- | Makefile | 3 | ||||
-rw-r--r-- | archival/gunzip.c | 1 | ||||
-rw-r--r-- | freeramdisk.c | 4 | ||||
-rw-r--r-- | fsck_minix.c | 3 | ||||
-rw-r--r-- | gunzip.c | 1 | ||||
-rw-r--r-- | init.c | 2 | ||||
-rw-r--r-- | init/init.c | 2 | ||||
-rw-r--r-- | util-linux/freeramdisk.c | 4 | ||||
-rw-r--r-- | util-linux/fsck_minix.c | 3 |
9 files changed, 14 insertions, 9 deletions
@@ -33,7 +33,8 @@ DOSTATIC = false | |||
33 | 33 | ||
34 | # To compile vs an alternative libc, you may need to use/adjust | 34 | # To compile vs an alternative libc, you may need to use/adjust |
35 | # the following lines to meet your needs. This is how I did it... | 35 | # the following lines to meet your needs. This is how I did it... |
36 | #CFLAGS+=-nostdinc -I/home/andersen/CVS/uC-libc/include -I/usr/include/linux | 36 | #GCCINCDIR = $(shell gcc -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp") |
37 | #CFLAGS+=-nostdinc -fno-builtin -I/home/andersen/CVS/uC-libc/include -I$(GCCINCDIR) | ||
37 | #LDFLAGS+=-nostdlib | 38 | #LDFLAGS+=-nostdlib |
38 | #LIBRARIES = /home/andersen/CVS/uC-libc/libc.a | 39 | #LIBRARIES = /home/andersen/CVS/uC-libc/libc.a |
39 | 40 | ||
diff --git a/archival/gunzip.c b/archival/gunzip.c index f2bb59dd7..d6382aed0 100644 --- a/archival/gunzip.c +++ b/archival/gunzip.c | |||
@@ -28,6 +28,7 @@ | |||
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include "internal.h" | 30 | #include "internal.h" |
31 | #include <getopt.h> | ||
31 | 32 | ||
32 | static const char gunzip_usage[] = | 33 | static const char gunzip_usage[] = |
33 | "gunzip [OPTION]... FILE\n" | 34 | "gunzip [OPTION]... FILE\n" |
diff --git a/freeramdisk.c b/freeramdisk.c index fdac5ea46..a6fa2431f 100644 --- a/freeramdisk.c +++ b/freeramdisk.c | |||
@@ -23,7 +23,6 @@ | |||
23 | 23 | ||
24 | #include <stdio.h> | 24 | #include <stdio.h> |
25 | #include <string.h> | 25 | #include <string.h> |
26 | #include <linux/fs.h> | ||
27 | #include <sys/types.h> | 26 | #include <sys/types.h> |
28 | #include <sys/stat.h> | 27 | #include <sys/stat.h> |
29 | #include <fcntl.h> | 28 | #include <fcntl.h> |
@@ -32,6 +31,9 @@ | |||
32 | #include "internal.h" | 31 | #include "internal.h" |
33 | 32 | ||
34 | 33 | ||
34 | /* From linux/fs.h */ | ||
35 | #define BLKFLSBUF _IO(0x12,97) /* flush buffer cache */ | ||
36 | |||
35 | 37 | ||
36 | static const char freeramdisk_usage[] = | 38 | static const char freeramdisk_usage[] = |
37 | "freeramdisk DEVICE\n" | 39 | "freeramdisk DEVICE\n" |
diff --git a/fsck_minix.c b/fsck_minix.c index adeb78967..a140bcecf 100644 --- a/fsck_minix.c +++ b/fsck_minix.c | |||
@@ -86,6 +86,7 @@ | |||
86 | * enforced (but it's not much fun on a character device :-). | 86 | * enforced (but it's not much fun on a character device :-). |
87 | */ | 87 | */ |
88 | 88 | ||
89 | #include <linux/fs.h> | ||
89 | #include "internal.h" | 90 | #include "internal.h" |
90 | #include <stdio.h> | 91 | #include <stdio.h> |
91 | #include <errno.h> | 92 | #include <errno.h> |
@@ -98,8 +99,6 @@ | |||
98 | #include <mntent.h> | 99 | #include <mntent.h> |
99 | #include <sys/stat.h> | 100 | #include <sys/stat.h> |
100 | #include <sys/param.h> | 101 | #include <sys/param.h> |
101 | |||
102 | #include <linux/fs.h> | ||
103 | #include <linux/minix_fs.h> | 102 | #include <linux/minix_fs.h> |
104 | 103 | ||
105 | #ifdef MINIX2_SUPER_MAGIC2 | 104 | #ifdef MINIX2_SUPER_MAGIC2 |
@@ -28,6 +28,7 @@ | |||
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include "internal.h" | 30 | #include "internal.h" |
31 | #include <getopt.h> | ||
31 | 32 | ||
32 | static const char gunzip_usage[] = | 33 | static const char gunzip_usage[] = |
33 | "gunzip [OPTION]... FILE\n" | 34 | "gunzip [OPTION]... FILE\n" |
@@ -42,11 +42,11 @@ | |||
42 | #include <linux/version.h> | 42 | #include <linux/version.h> |
43 | #include <linux/reboot.h> | 43 | #include <linux/reboot.h> |
44 | #include <linux/unistd.h> | 44 | #include <linux/unistd.h> |
45 | #include <linux/vt.h> /* for vt_stat */ | ||
45 | #include <sys/fcntl.h> | 46 | #include <sys/fcntl.h> |
46 | #include <sys/ioctl.h> | 47 | #include <sys/ioctl.h> |
47 | #include <sys/mount.h> | 48 | #include <sys/mount.h> |
48 | #include <sys/types.h> | 49 | #include <sys/types.h> |
49 | #include <sys/vt.h> /* for vt_stat */ | ||
50 | #include <sys/wait.h> | 50 | #include <sys/wait.h> |
51 | #ifdef BB_SYSLOGD | 51 | #ifdef BB_SYSLOGD |
52 | # include <sys/syslog.h> | 52 | # include <sys/syslog.h> |
diff --git a/init/init.c b/init/init.c index 26e4dc7a7..7236cf851 100644 --- a/init/init.c +++ b/init/init.c | |||
@@ -42,11 +42,11 @@ | |||
42 | #include <linux/version.h> | 42 | #include <linux/version.h> |
43 | #include <linux/reboot.h> | 43 | #include <linux/reboot.h> |
44 | #include <linux/unistd.h> | 44 | #include <linux/unistd.h> |
45 | #include <linux/vt.h> /* for vt_stat */ | ||
45 | #include <sys/fcntl.h> | 46 | #include <sys/fcntl.h> |
46 | #include <sys/ioctl.h> | 47 | #include <sys/ioctl.h> |
47 | #include <sys/mount.h> | 48 | #include <sys/mount.h> |
48 | #include <sys/types.h> | 49 | #include <sys/types.h> |
49 | #include <sys/vt.h> /* for vt_stat */ | ||
50 | #include <sys/wait.h> | 50 | #include <sys/wait.h> |
51 | #ifdef BB_SYSLOGD | 51 | #ifdef BB_SYSLOGD |
52 | # include <sys/syslog.h> | 52 | # include <sys/syslog.h> |
diff --git a/util-linux/freeramdisk.c b/util-linux/freeramdisk.c index fdac5ea46..a6fa2431f 100644 --- a/util-linux/freeramdisk.c +++ b/util-linux/freeramdisk.c | |||
@@ -23,7 +23,6 @@ | |||
23 | 23 | ||
24 | #include <stdio.h> | 24 | #include <stdio.h> |
25 | #include <string.h> | 25 | #include <string.h> |
26 | #include <linux/fs.h> | ||
27 | #include <sys/types.h> | 26 | #include <sys/types.h> |
28 | #include <sys/stat.h> | 27 | #include <sys/stat.h> |
29 | #include <fcntl.h> | 28 | #include <fcntl.h> |
@@ -32,6 +31,9 @@ | |||
32 | #include "internal.h" | 31 | #include "internal.h" |
33 | 32 | ||
34 | 33 | ||
34 | /* From linux/fs.h */ | ||
35 | #define BLKFLSBUF _IO(0x12,97) /* flush buffer cache */ | ||
36 | |||
35 | 37 | ||
36 | static const char freeramdisk_usage[] = | 38 | static const char freeramdisk_usage[] = |
37 | "freeramdisk DEVICE\n" | 39 | "freeramdisk DEVICE\n" |
diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c index adeb78967..a140bcecf 100644 --- a/util-linux/fsck_minix.c +++ b/util-linux/fsck_minix.c | |||
@@ -86,6 +86,7 @@ | |||
86 | * enforced (but it's not much fun on a character device :-). | 86 | * enforced (but it's not much fun on a character device :-). |
87 | */ | 87 | */ |
88 | 88 | ||
89 | #include <linux/fs.h> | ||
89 | #include "internal.h" | 90 | #include "internal.h" |
90 | #include <stdio.h> | 91 | #include <stdio.h> |
91 | #include <errno.h> | 92 | #include <errno.h> |
@@ -98,8 +99,6 @@ | |||
98 | #include <mntent.h> | 99 | #include <mntent.h> |
99 | #include <sys/stat.h> | 100 | #include <sys/stat.h> |
100 | #include <sys/param.h> | 101 | #include <sys/param.h> |
101 | |||
102 | #include <linux/fs.h> | ||
103 | #include <linux/minix_fs.h> | 102 | #include <linux/minix_fs.h> |
104 | 103 | ||
105 | #ifdef MINIX2_SUPER_MAGIC2 | 104 | #ifdef MINIX2_SUPER_MAGIC2 |