From 1e03add675c58c17d96f51cafa008066d4220a09 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Thu, 6 Jul 2000 09:56:35 +0000
Subject: [PATCH] a few minor cleanups.  -Erik

---
 Makefile                 | 3 ++-
 archival/gunzip.c        | 1 +
 freeramdisk.c            | 4 +++-
 fsck_minix.c             | 3 +--
 gunzip.c                 | 1 +
 init.c                   | 2 +-
 init/init.c              | 2 +-
 util-linux/freeramdisk.c | 4 +++-
 util-linux/fsck_minix.c  | 3 +--
 9 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 27ea8fd7f..ff2f8f88f 100644
--- a/Makefile
+++ b/Makefile
@@ -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 f2bb59dd7..d6382aed0 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 fdac5ea46..a6fa2431f 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 adeb78967..a140bcecf 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
diff --git a/gunzip.c b/gunzip.c
index f2bb59dd7..d6382aed0 100644
--- a/gunzip.c
+++ b/gunzip.c
@@ -28,6 +28,7 @@
  */
 
 #include "internal.h"
+#include <getopt.h>
 
 static const char gunzip_usage[] =
 	"gunzip [OPTION]... FILE\n"
diff --git a/init.c b/init.c
index 26e4dc7a7..7236cf851 100644
--- a/init.c
+++ b/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/init/init.c b/init/init.c
index 26e4dc7a7..7236cf851 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 fdac5ea46..a6fa2431f 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 adeb78967..a140bcecf 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