From: Karel Zak <kzak@redhat.com>
Date: Fri, 21 Jun 2013 10:45:30 +0000 (+0200)
Subject: fdisk: (dos) move macro is_dos_compatible()
X-Git-Tag: v2.24-rc1~162
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28b85e603dbac18b35fa18288eb68024ca7d4756;p=thirdparty%2Futil-linux.git

fdisk: (dos) move macro is_dos_compatible()

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/fdisks/fdiskdoslabel.c b/fdisks/fdiskdoslabel.c
index 109f85880f..a4ddbe3b80 100644
--- a/fdisks/fdiskdoslabel.c
+++ b/fdisks/fdiskdoslabel.c
@@ -65,6 +65,9 @@ static struct fdisk_parttype dos_parttypes[] = {
 
 #define alignment_required(_x)	((_x)->grain != (_x)->sector_size)
 
+#define is_dos_compatible(_x) \
+		   (fdisk_is_disklabel(_x, DOS) && \
+                    fdisk_dos_is_compatible(fdisk_context_get_label(_x, NULL)))
 
 #define cround(c, n)	(fdisk_context_use_cylinders(c) ? \
 				((n) / fdisk_context_get_units_per_sector(c)) + 1 : (n))
diff --git a/fdisks/fdiskdoslabel.h b/fdisks/fdiskdoslabel.h
index 0054340841..d96e7f959a 100644
--- a/fdisks/fdiskdoslabel.h
+++ b/fdisks/fdiskdoslabel.h
@@ -18,10 +18,6 @@ extern void dos_fix_partition_table_order(struct fdisk_context *cxt);
 extern void dos_move_begin(struct fdisk_context *cxt, int i);
 extern void dos_toggle_active(struct fdisk_context *cxt, int i);
 
-#define is_dos_compatible(_x) \
-		   (fdisk_is_disklabel(_x, DOS) && \
-                    fdisk_dos_is_compatible(fdisk_context_get_label(_x, NULL)))
-
 /* toggle flags */
 #define DOS_FLAG_ACTIVE	1