diff options
author | Rob Landley <rob@landley.net> | 2006-06-16 04:25:19 +0000 |
---|---|---|
committer | Rob Landley <rob@landley.net> | 2006-06-16 04:25:19 +0000 |
commit | bc8c50351f304796dc5c54a0f3a4f4c7882ea9e4 (patch) | |
tree | cf3245830d4f6feabb8a8c87592bdac501fbebc8 /util-linux | |
parent | 9947a244d44edd3862694cce7a91e706b0cbd529 (diff) | |
download | busybox-w32-bc8c50351f304796dc5c54a0f3a4f4c7882ea9e4.tar.gz busybox-w32-bc8c50351f304796dc5c54a0f3a4f4c7882ea9e4.tar.bz2 busybox-w32-bc8c50351f304796dc5c54a0f3a4f4c7882ea9e4.zip |
Remove warnings caused by #include <sys/mount.h> in platform.h. Apparently
we redefine a lot of stuff from standard header files...
Diffstat (limited to 'util-linux')
-rw-r--r-- | util-linux/freeramdisk.c | 2 | ||||
-rw-r--r-- | util-linux/fsck_minix.c | 3 | ||||
-rw-r--r-- | util-linux/mkfs_minix.c | 3 | ||||
-rw-r--r-- | util-linux/mkswap.c | 12 |
4 files changed, 1 insertions, 19 deletions
diff --git a/util-linux/freeramdisk.c b/util-linux/freeramdisk.c index 1f010c721..c959158c9 100644 --- a/util-linux/freeramdisk.c +++ b/util-linux/freeramdisk.c | |||
@@ -18,8 +18,6 @@ | |||
18 | #include <unistd.h> | 18 | #include <unistd.h> |
19 | #include "busybox.h" | 19 | #include "busybox.h" |
20 | 20 | ||
21 | /* From linux/fs.h */ | ||
22 | #define BLKFLSBUF _IO(0x12,97) | ||
23 | /* From <linux/fd.h> */ | 21 | /* From <linux/fd.h> */ |
24 | #define FDFLUSH _IO(2,0x4b) | 22 | #define FDFLUSH _IO(2,0x4b) |
25 | 23 | ||
diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c index a9c4467d8..f958bdfc9 100644 --- a/util-linux/fsck_minix.c +++ b/util-linux/fsck_minix.c | |||
@@ -98,9 +98,6 @@ | |||
98 | #include <sys/param.h> | 98 | #include <sys/param.h> |
99 | #include "busybox.h" | 99 | #include "busybox.h" |
100 | 100 | ||
101 | #define BLOCK_SIZE_BITS 10 | ||
102 | #define BLOCK_SIZE (1<<BLOCK_SIZE_BITS) | ||
103 | |||
104 | /* | 101 | /* |
105 | * This is the original minix inode layout on disk. | 102 | * This is the original minix inode layout on disk. |
106 | * Note the 8-bit gid and atime and ctime. | 103 | * Note the 8-bit gid and atime and ctime. |
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c index d9388b1d7..7f52b563e 100644 --- a/util-linux/mkfs_minix.c +++ b/util-linux/mkfs_minix.c | |||
@@ -151,9 +151,6 @@ struct minix_dir_entry { | |||
151 | char name[0]; | 151 | char name[0]; |
152 | }; | 152 | }; |
153 | 153 | ||
154 | #define BLOCK_SIZE_BITS 10 | ||
155 | #define BLOCK_SIZE (1<<BLOCK_SIZE_BITS) | ||
156 | |||
157 | #define NAME_MAX 255 /* # chars in a file name */ | 154 | #define NAME_MAX 255 /* # chars in a file name */ |
158 | 155 | ||
159 | #define MINIX_INODES_PER_BLOCK ((BLOCK_SIZE)/(sizeof (struct minix_inode))) | 156 | #define MINIX_INODES_PER_BLOCK ((BLOCK_SIZE)/(sizeof (struct minix_inode))) |
diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c index 0054eca24..b48d1f036 100644 --- a/util-linux/mkswap.c +++ b/util-linux/mkswap.c | |||
@@ -35,24 +35,14 @@ | |||
35 | * | 35 | * |
36 | */ | 36 | */ |
37 | 37 | ||
38 | #include <stdio.h> | 38 | #include "busybox.h" |
39 | #include <unistd.h> | 39 | #include <unistd.h> |
40 | #include <string.h> | 40 | #include <string.h> |
41 | #include <fcntl.h> | 41 | #include <fcntl.h> |
42 | #include <stdlib.h> | ||
43 | #include <sys/ioctl.h> /* for _IO */ | 42 | #include <sys/ioctl.h> /* for _IO */ |
44 | #include <sys/utsname.h> | 43 | #include <sys/utsname.h> |
45 | #include <asm/page.h> /* for PAGE_SIZE and PAGE_SHIFT */ | 44 | #include <asm/page.h> /* for PAGE_SIZE and PAGE_SHIFT */ |
46 | /* we also get PAGE_SIZE via getpagesize() */ | 45 | /* we also get PAGE_SIZE via getpagesize() */ |
47 | #include "busybox.h" | ||
48 | |||
49 | #ifndef _IO | ||
50 | /* pre-1.3.45 */ | ||
51 | enum { BLKGETSIZE = 0x1260 }; | ||
52 | #else | ||
53 | /* same on i386, m68k, arm; different on alpha, mips, sparc, ppc */ | ||
54 | #define BLKGETSIZE _IO(0x12,96) | ||
55 | #endif | ||
56 | 46 | ||
57 | static char *device_name = NULL; | 47 | static char *device_name = NULL; |
58 | static int DEV = -1; | 48 | static int DEV = -1; |