Remove warnings caused by #include <sys/mount.h> in platform.h. Apparently

we redefine a lot of stuff from standard header files...

diff --git a/util-linux/freeramdisk.c b/util-linux/freeramdisk.c
index 1f010c721896a5ebca83af0f72d4b08134d6df1f..c959158c99f00b0ade7360adf48a35067d3da99b 100644 (file)
--- a/util-linux/freeramdisk.c
+++ b/util-linux/freeramdisk.c
@@ -18,8 +18,6 @@
 #include <unistd.h>
 #include "busybox.h"
 
-/* From linux/fs.h */
-#define BLKFLSBUF  _IO(0x12,97)
 /* From <linux/fd.h> */
 #define FDFLUSH  _IO(2,0x4b)
 

diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c
index a9c4467d8463a7b11560400ec602925a25ebdcff..f958bdfc97ae9c0350da3c9296a1d38f35d3330e 100644 (file)
--- a/util-linux/fsck_minix.c
+++ b/util-linux/fsck_minix.c
@@ -98,9 +98,6 @@
 #include <sys/param.h>
 #include "busybox.h"
 
-#define BLOCK_SIZE_BITS 10
-#define BLOCK_SIZE (1<<BLOCK_SIZE_BITS)
-
 /*
  * This is the original minix inode layout on disk.
  * Note the 8-bit gid and atime and ctime.

diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index d9388b1d7ef05cd37661a9783d2111079d2400d8..7f52b563e49b1a0b83345bf98efd06c7e947e740 100644 (file)
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -151,9 +151,6 @@ struct minix_dir_entry {
        char name[0];
 };
 
-#define BLOCK_SIZE_BITS 10
-#define BLOCK_SIZE (1<<BLOCK_SIZE_BITS)
-
 #define NAME_MAX         255   /* # chars in a file name */
 
 #define MINIX_INODES_PER_BLOCK ((BLOCK_SIZE)/(sizeof (struct minix_inode)))

diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c
index 0054eca2473f9c944ae8c07913ef0fade2d7a72c..b48d1f036df9c11f4e2983862e56d3ddaef4d12d 100644 (file)
--- a/util-linux/mkswap.c
+++ b/util-linux/mkswap.c
@@ -35,24 +35,14 @@
  *
  */
 
-#include <stdio.h>
+#include "busybox.h"
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
-#include <stdlib.h>
 #include <sys/ioctl.h>                 /* for _IO */
 #include <sys/utsname.h>
 #include <asm/page.h>                  /* for PAGE_SIZE and PAGE_SHIFT */
                                /* we also get PAGE_SIZE via getpagesize() */
-#include "busybox.h"
-
-#ifndef _IO
-/* pre-1.3.45 */
-enum { BLKGETSIZE = 0x1260 };
-#else
-/* same on i386, m68k, arm; different on alpha, mips, sparc, ppc */
-#define BLKGETSIZE _IO(0x12,96)
-#endif
 
 static char *device_name = NULL;
 static int DEV = -1;