summaryrefslogtreecommitdiffstats
path: root/lib/label
diff options
context:
space:
mode:
authorAlasdair Kergon <agk@redhat.com>2003-03-24 18:08:53 +0000
committerAlasdair Kergon <agk@redhat.com>2003-03-24 18:08:53 +0000
commit26e7f2e0c4eba61ac7aa91810f549837eb880827 (patch)
tree008337d10c630f0f842931863ab8166184cbfdaf /lib/label
parent3a1703294b88978fae66b152068a8c380695f34e (diff)
downloadlvm2-26e7f2e0c4eba61ac7aa91810f549837eb880827.tar.gz
lvm2-26e7f2e0c4eba61ac7aa91810f549837eb880827.tar.xz
lvm2-26e7f2e0c4eba61ac7aa91810f549837eb880827.zip
Tidy various pre-processing incl. making libdl optional.
Diffstat (limited to 'lib/label')
-rw-r--r--lib/label/label.c4
-rw-r--r--lib/label/label.h1
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/label/label.c b/lib/label/label.c
index 437828d8..1af5443d 100644
--- a/lib/label/label.c
+++ b/lib/label/label.c
@@ -117,7 +117,7 @@ static struct labeller *_find_labeller(struct device *dev, char *buf,
return NULL;
}
- if (dev_read(dev, __UINT64_C(0), LABEL_SCAN_SIZE, readbuf) !=
+ if (dev_read(dev, UINT64_C(0), LABEL_SCAN_SIZE, readbuf) !=
LABEL_SCAN_SIZE) {
log_debug("%s: Failed to read label area", dev_name(dev));
goto out;
@@ -205,7 +205,7 @@ int label_remove(struct device *dev)
return 0;
}
- if (dev_read(dev, __UINT64_C(0), LABEL_SCAN_SIZE, readbuf) !=
+ if (dev_read(dev, UINT64_C(0), LABEL_SCAN_SIZE, readbuf) !=
LABEL_SCAN_SIZE) {
log_debug("%s: Failed to read label area", dev_name(dev));
goto out;
diff --git a/lib/label/label.h b/lib/label/label.h
index 20d825c0..b2dbc825 100644
--- a/lib/label/label.h
+++ b/lib/label/label.h
@@ -8,7 +8,6 @@
#define _LVM_LABEL_H
#include "cache.h"
-#include "lvm-types.h"
#include "uuid.h"
#include "device.h"