summaryrefslogtreecommitdiffstats
path: root/disk-utils/mkfs.minix.c
diff options
context:
space:
mode:
authorKarel Zak2008-12-05 14:38:54 +0100
committerKarel Zak2008-12-05 14:38:54 +0100
commit727b3c2f26e1bf5e29c3aefc5cedcedd0422c238 (patch)
tree3aae43e9277ca9f5a1a0c0e1264ea6f037cf5cf1 /disk-utils/mkfs.minix.c
parentbuild-sys: add missing AC_C_BIGENDIAN (diff)
downloadkernel-qcow2-util-linux-727b3c2f26e1bf5e29c3aefc5cedcedd0422c238.tar.gz
kernel-qcow2-util-linux-727b3c2f26e1bf5e29c3aefc5cedcedd0422c238.tar.xz
kernel-qcow2-util-linux-727b3c2f26e1bf5e29c3aefc5cedcedd0422c238.zip
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>
Diffstat (limited to 'disk-utils/mkfs.minix.c')
-rw-r--r--disk-utils/mkfs.minix.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c
index f0c45c468..4744db8c6 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))