diff options
| author | Karel Zak | 2011-03-16 17:45:53 +0100 |
|---|---|---|
| committer | Karel Zak | 2011-03-16 17:45:53 +0100 |
| commit | 64d15476c06d0ff05cdccb4b5fc587adf56e1a85 (patch) | |
| tree | 7511f617d9147289fa0516be045d908f58337ab5 /fdisk | |
| parent | build-sys: clean up partx Makefile (diff) | |
| download | kernel-qcow2-util-linux-64d15476c06d0ff05cdccb4b5fc587adf56e1a85.tar.gz kernel-qcow2-util-linux-64d15476c06d0ff05cdccb4b5fc587adf56e1a85.tar.xz kernel-qcow2-util-linux-64d15476c06d0ff05cdccb4b5fc587adf56e1a85.zip | |
build-sys: don't use HAVE_LIBBLKID_INTERNAL macro
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'fdisk')
| -rw-r--r-- | fdisk/cfdisk.c | 6 | ||||
| -rw-r--r-- | fdisk/fdisk.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c index f9aa05942..fa9353efe 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 b6b81e493..f0f806143 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(); |