From: Karel Zak <kzak@redhat.com>
Date: Wed, 16 Mar 2011 16:45:53 +0000 (+0100)
Subject: build-sys: don't use HAVE_LIBBLKID_INTERNAL macro
X-Git-Tag: v2.20-rc1~436
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=64d15476c06d0ff05cdccb4b5fc587adf56e1a85;p=thirdparty%2Futil-linux.git

build-sys: don't use HAVE_LIBBLKID_INTERNAL macro

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

diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index 5ddde90012..599b9b047c 100644
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -62,7 +62,7 @@
 # include <uuid.h>
 #endif
 
-#ifdef HAVE_LIBBLKID_INTERNAL
+#ifdef HAVE_LIBBLKID
 # include <blkid.h>
 #endif
 
@@ -387,7 +387,7 @@ zap_bootbits(int fd, const char *devname, int force, int is_blkdev)
 			whole = 1;
 			zap = 0;
 		} else {
-#ifdef HAVE_LIBBLKID_INTERNAL
+#ifdef HAVE_LIBBLKID
 			blkid_probe pr = blkid_new_probe();
 			if (!pr)
 				errx(EXIT_FAILURE, _("unable to alloc new libblkid probe"));
diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c
index f9aa05942e..fa9353efe4 100644
--- a/fdisk/cfdisk.c
+++ b/fdisk/cfdisk.c
@@ -89,7 +89,7 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 
-#ifdef HAVE_LIBBLKID_INTERNAL
+#ifdef HAVE_LIBBLKID
 #include <blkid.h>
 #endif
 
@@ -612,7 +612,7 @@ write_sector(unsigned char *buffer, long long sect_num) {
 	fatal(_("Cannot write disk drive"), 2);
 }
 
-#ifdef HAVE_LIBBLKID_INTERNAL
+#ifdef HAVE_LIBBLKID
 static void
 get_fsinfo(int i)
 {
@@ -949,7 +949,7 @@ add_part(int num, int id, int flags, long long first, long long last,
     p_info[i].fstype[0] = 0;
     p_info[i].ostype[0] = 0;
 
-#ifdef HAVE_LIBBLKID_INTERNAL
+#ifdef HAVE_LIBBLKID
     if (want_label)
 	 get_fsinfo(i);
 #endif
diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index b6b81e493f..f0f806143e 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -44,7 +44,7 @@
 #ifdef HAVE_LINUX_BLKPG_H
 #include <linux/blkpg.h>
 #endif
-#ifdef HAVE_LIBBLKID_INTERNAL
+#ifdef HAVE_LIBBLKID
 #include <blkid.h>
 #endif
 
@@ -957,7 +957,7 @@ create_doslabel(void) {
 static void
 get_topology(int fd) {
 	int arg;
-#ifdef HAVE_LIBBLKID_INTERNAL
+#ifdef HAVE_LIBBLKID
 	blkid_probe pr;
 
 	pr = blkid_new_probe();