X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fvolume_id%2Flibvolume_id%2Fiso9660.c;h=7b78a7e99285b964b3ddfb01adb5e2c1c9e2122f;hb=b5e694267142042228a6cac99ecad6c4b4ef8759;hp=b6654cecf22a8152ef8eb47138a876739626ef38;hpb=accff726856a0b3258a413d823a534f4f437e6b2;p=elogind.git

diff --git a/extras/volume_id/libvolume_id/iso9660.c b/extras/volume_id/libvolume_id/iso9660.c
index b6654cecf..7b78a7e99 100644
--- a/extras/volume_id/libvolume_id/iso9660.c
+++ b/extras/volume_id/libvolume_id/iso9660.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"
 
 #define ISO_SUPERBLOCK_OFFSET		0x8000
@@ -45,14 +44,14 @@ struct iso_volume_descriptor {
 	uint8_t		unused[8];
 	uint8_t		space_size[8];
 	uint8_t		escape_sequences[8];
-} __attribute__((__packed__));
+} PACKED;
 
 struct high_sierra_volume_descriptor {
 	uint8_t		foo[8];
 	uint8_t		type;
 	uint8_t		id[4];
 	uint8_t		version;
-} __attribute__((__packed__));
+} PACKED;
 
 int volume_id_probe_iso9660(struct volume_id *id, uint64_t off)
 {