From: Karel Zak <kzak@redhat.com>
Date: Fri, 5 Dec 2008 13:38:54 +0000 (+0100)
Subject: mkfs.minix: (and fsck) rename bitops.h
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=727b3c2f26e1bf5e29c3aefc5cedcedd0422c238;p=util-linux

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>
---

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
similarity index 100%
rename from disk-utils/bitops.h
rename to 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))