diff options
| author | Eric Andersen | 2000-07-06 09:56:35 +0000 |
|---|---|---|
| committer | Eric Andersen | 2000-07-06 09:56:35 +0000 |
| commit | 1e03add675c58c17d96f51cafa008066d4220a09 (patch) | |
| tree | 707976ee4be91a365342b34d8069e6c9e0f089bf | |
| parent | 5d893b6beb2a42c6c3bc0fd0b5447bcfc8a0f84c (diff) | |
| download | busybox-1e03add675c58c17d96f51cafa008066d4220a09.zip busybox-1e03add675c58c17d96f51cafa008066d4220a09.tar.gz | |
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 # To compile vs an alternative libc, you may need to use/adjust # the following lines to meet your needs. This is how I did it... -#CFLAGS+=-nostdinc -I/home/andersen/CVS/uC-libc/include -I/usr/include/linux +#GCCINCDIR = $(shell gcc -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp") +#CFLAGS+=-nostdinc -fno-builtin -I/home/andersen/CVS/uC-libc/include -I$(GCCINCDIR) #LDFLAGS+=-nostdlib #LIBRARIES = /home/andersen/CVS/uC-libc/libc.a diff --git a/archival/gunzip.c b/archival/gunzip.c index f2bb59d..d6382ae 100644 --- a/archival/gunzip.c +++ b/archival/gunzip.c @@ -28,6 +28,7 @@ */ #include "internal.h" +#include <getopt.h> static const char gunzip_usage[] = "gunzip [OPTION]... FILE\n" diff --git a/freeramdisk.c b/freeramdisk.c index fdac5ea..a6fa243 100644 --- a/freeramdisk.c +++ b/freeramdisk.c @@ -23,7 +23,6 @@ #include <stdio.h> #include <string.h> -#include <linux/fs.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> @@ -32,6 +31,9 @@ #include "internal.h" +/* From linux/fs.h */ +#define BLKFLSBUF _IO(0x12,97) /* flush buffer cache */ + static const char freeramdisk_usage[] = "freeramdisk DEVICE\n" diff --git a/fsck_minix.c b/fsck_minix.c index adeb789..a140bce 100644 --- a/fsck_minix.c +++ b/fsck_minix.c @@ -86,6 +86,7 @@ * enforced (but it's not much fun on a character device :-). */ +#include <linux/fs.h> #include "internal.h" #include <stdio.h> #include <errno.h> @@ -98,8 +99,6 @@ #include <mntent.h> #include <sys/stat.h> #include <sys/param.h> - -#include <linux/fs.h> #include <linux/minix_fs.h> #ifdef MINIX2_SUPER_MAGIC2 @@ -28,6 +28,7 @@ */ #include "internal.h" +#include <getopt.h> static const char gunzip_usage[] = "gunzip [OPTION]... FILE\n" @@ -42,11 +42,11 @@ #include <linux/version.h> #include <linux/reboot.h> #include <linux/unistd.h> +#include <linux/vt.h> /* for vt_stat */ #include <sys/fcntl.h> #include <sys/ioctl.h> #include <sys/mount.h> #include <sys/types.h> -#include <sys/vt.h> /* for vt_stat */ #include <sys/wait.h> #ifdef BB_SYSLOGD # include <sys/syslog.h> diff --git a/init/init.c b/init/init.c index 26e4dc7..7236cf8 100644 --- a/init/init.c +++ b/init/init.c @@ -42,11 +42,11 @@ #include <linux/version.h> #include <linux/reboot.h> #include <linux/unistd.h> +#include <linux/vt.h> /* for vt_stat */ #include <sys/fcntl.h> #include <sys/ioctl.h> #include <sys/mount.h> #include <sys/types.h> -#include <sys/vt.h> /* for vt_stat */ #include <sys/wait.h> #ifdef BB_SYSLOGD # include <sys/syslog.h> diff --git a/util-linux/freeramdisk.c b/util-linux/freeramdisk.c index fdac5ea..a6fa243 100644 --- a/util-linux/freeramdisk.c +++ b/util-linux/freeramdisk.c @@ -23,7 +23,6 @@ #include <stdio.h> #include <string.h> -#include <linux/fs.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> @@ -32,6 +31,9 @@ #include "internal.h" +/* From linux/fs.h */ +#define BLKFLSBUF _IO(0x12,97) /* flush buffer cache */ + static const char freeramdisk_usage[] = "freeramdisk DEVICE\n" diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c index adeb789..a140bce 100644 --- a/util-linux/fsck_minix.c +++ b/util-linux/fsck_minix.c @@ -86,6 +86,7 @@ * enforced (but it's not much fun on a character device :-). */ +#include <linux/fs.h> #include "internal.h" #include <stdio.h> #include <errno.h> @@ -98,8 +99,6 @@ #include <mntent.h> #include <sys/stat.h> #include <sys/param.h> - -#include <linux/fs.h> #include <linux/minix_fs.h> #ifdef MINIX2_SUPER_MAGIC2 |