summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley2006-06-16 04:25:19 +0000
committerRob Landley2006-06-16 04:25:19 +0000
commitbc8c50351f304796dc5c54a0f3a4f4c7882ea9e4 (patch)
treecf3245830d4f6feabb8a8c87592bdac501fbebc8
parent9947a244d44edd3862694cce7a91e706b0cbd529 (diff)
downloadbusybox-bc8c50351f304796dc5c54a0f3a4f4c7882ea9e4.zip
busybox-bc8c50351f304796dc5c54a0f3a4f4c7882ea9e4.tar.gz
Remove warnings caused by #include <sys/mount.h> in platform.h. Apparently
we redefine a lot of stuff from standard header files...
-rw-r--r--util-linux/freeramdisk.c2
-rw-r--r--util-linux/fsck_minix.c3
-rw-r--r--util-linux/mkfs_minix.c3
-rw-r--r--util-linux/mkswap.c12
4 files changed, 1 insertions, 19 deletions
diff --git a/util-linux/freeramdisk.c b/util-linux/freeramdisk.c
index 1f010c7..c959158 100644
--- 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 a9c4467..f958bdf 100644
--- 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 d9388b1..7f52b56 100644
--- 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 0054eca..b48d1f0 100644
--- 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;