X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fvolume_id%2Flibvolume_id%2Flvm.c;h=47d84b09686206b26be93441e383dea2f52a91b2;hb=b5e694267142042228a6cac99ecad6c4b4ef8759;hp=650986256d384fc11d9d2b070911a14a60df308a;hpb=f054627f500450a7aadeaf8a9930354fb268718e;p=elogind.git

diff --git a/extras/volume_id/libvolume_id/lvm.c b/extras/volume_id/libvolume_id/lvm.c
index 650986256..47d84b096 100644
--- 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"