volume_id: provide a custom debug function

[elogind.git] / extras / volume_id / libvolume_id / lvm.c

diff --git a/extras/volume_id/libvolume_id/lvm.c b/extras/volume_id/libvolume_id/lvm.c
index 650986256d384fc11d9d2b070911a14a60df308a..47d84b09686206b26be93441e383dea2f52a91b2 100644 (file)
--- a/extras/volume_id/libvolume_id/lvm.c
+++ b/extras/volume_id/libvolume_id/lvm.c
@@ -23,13 +23,12 @@
 #include <errno.h>
 #include <ctype.h>
 
-#include "volume_id.h"
-#include "logging.h"
+#include "libvolume_id.h"
 #include "util.h"
 
 struct lvm1_super_block {
        uint8_t id[2];
-} __attribute__((packed));
+} PACKED;
 
 struct lvm2_super_block {
        uint8_t         id[8];
@@ -37,7 +36,7 @@ struct lvm2_super_block {
        uint32_t        crc_xl;
        uint32_t        offset_xl;
        uint8_t         type[8];
-} __attribute__((packed));
+} PACKED;
 
 #define LVM1_SB_OFF                    0x400
 #define LVM1_MAGIC                     "HM"