diff options
| author | Karel Zak <kzak@redhat.com> | 2008-12-05 14:38:54 +0100 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2008-12-05 14:38:54 +0100 |
| commit | 727b3c2f26e1bf5e29c3aefc5cedcedd0422c238 (patch) | |
| tree | 3aae43e9277ca9f5a1a0c0e1264ea6f037cf5cf1 | |
| parent | 43f2d5bcbc61d2fb4731a7a28908fee20132727f (diff) | |
| download | util-linux-old-727b3c2f26e1bf5e29c3aefc5cedcedd0422c238.tar.gz | |
mkfs.minix: (and fsck) rename bitops.h
This patch renames bitops.h to minix_bitops.h to avoid possible
collisions with global include/bitops.h file.
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | disk-utils/Makefile.am | 4 | ||||
| -rw-r--r-- | disk-utils/fsck.minix.c | 4 | ||||
| -rw-r--r-- | disk-utils/minix_bitops.h (renamed from disk-utils/bitops.h) | 0 | ||||
| -rw-r--r-- | disk-utils/mkfs.minix.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/disk-utils/Makefile.am b/disk-utils/Makefile.am index c005ed59..2304b2a0 100644 --- a/disk-utils/Makefile.am +++ b/disk-utils/Makefile.am @@ -9,8 +9,8 @@ dist_man_MANS = isosize.8 mkfs.8 mkswap.8 \ fsck.minix.8 mkfs.minix.8 mkfs.bfs.8 sbin_PROGRAMS = mkfs mkswap fsck.minix mkfs.minix mkfs.bfs -fsck_minix_SOURCES = fsck.minix.c bitops.h minix.h -mkfs_minix_SOURCES = mkfs.minix.c bitops.h minix.h $(utils_common) +fsck_minix_SOURCES = fsck.minix.c minix_bitops.h minix.h +mkfs_minix_SOURCES = mkfs.minix.c minix_bitops.h minix.h $(utils_common) mkfs_bfs_SOURCES = mkfs.bfs.c $(utils_common) mkswap_SOURCES = mkswap.c $(utils_common) diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c index 5c577f61..f6930d2a 100644 --- a/disk-utils/fsck.minix.c +++ b/disk-utils/fsck.minix.c @@ -1,5 +1,5 @@ /* - * fsck.c - a file system consistency checker for Linux. + * fsck.minix.c - a file system consistency checker for Linux. * * (C) 1991, 1992 Linus Torvalds. This file may be redistributed * as per the GNU copyleft. @@ -169,7 +169,7 @@ static unsigned char * zone_count = NULL; static void recursive_check(unsigned int ino); static void recursive_check2(unsigned int ino); -#include "bitops.h" +#include "minix_bitops.h" #define inode_in_use(x) (bit(inode_map,(x))) #define zone_in_use(x) (bit(zone_map,(x)-FIRSTZONE+1)) diff --git a/disk-utils/bitops.h b/disk-utils/minix_bitops.h index 270dc2d8..270dc2d8 100644 --- a/disk-utils/bitops.h +++ b/disk-utils/minix_bitops.h diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c index f0c45c46..4744db8c 100644 --- a/disk-utils/mkfs.minix.c +++ b/disk-utils/mkfs.minix.c @@ -1,5 +1,5 @@ /* - * mkfs.c - make a linux (minix) file-system. + * mkfs.minix.c - make a linux (minix) file-system. * * (C) 1991 Linus Torvalds. This file may be redistributed as per * the Linux copyright. @@ -135,7 +135,7 @@ static unsigned short good_blocks_table[MAX_GOOD_BLOCKS]; static int used_good_blocks = 0; static unsigned long req_nr_inodes = 0; -#include "bitops.h" +#include "minix_bitops.h" #define inode_in_use(x) (bit(inode_map,(x))) #define zone_in_use(x) (bit(zone_map,(x)-FIRSTZONE+1)) |