X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fvolume_id%2Flibvolume_id%2Fvia_raid.c;h=42cb0980651ad46ca6d1a2bc7eb63e9d01afc50a;hb=b5e694267142042228a6cac99ecad6c4b4ef8759;hp=66962cd7f058fdd0ed381e6f27991b574de881b0;hpb=f054627f500450a7aadeaf8a9930354fb268718e;p=elogind.git

diff --git a/extras/volume_id/libvolume_id/via_raid.c b/extras/volume_id/libvolume_id/via_raid.c
index 66962cd7f..42cb09806 100644
--- a/extras/volume_id/libvolume_id/via_raid.c
+++ b/extras/volume_id/libvolume_id/via_raid.c
@@ -23,8 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 
-#include "volume_id.h"
-#include "logging.h"
+#include "libvolume_id.h"
 #include "util.h"
 
 struct via_meta {
@@ -36,10 +35,10 @@ struct via_meta {
 		uint32_t	capacity_low;
 		uint32_t	capacity_high;
 		uint32_t	serial_checksum;
-	} __attribute((packed)) array;
+	} PACKED array;
 	uint32_t	serial_checksum[8];
 	uint8_t		checksum;
-} __attribute__((packed));
+} PACKED;
 
 #define VIA_SIGNATURE		0xAA55