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

diff --git a/extras/volume_id/libvolume_id/jfs.c b/extras/volume_id/libvolume_id/jfs.c
index b6ae9624d..b230fb258 100644
--- a/extras/volume_id/libvolume_id/jfs.c
+++ b/extras/volume_id/libvolume_id/jfs.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 jfs_super_block {
@@ -38,7 +37,7 @@ struct jfs_super_block {
 	uint8_t		uuid[16];
 	uint8_t		label[16];
 	uint8_t		loguuid[16];
-} __attribute__((__packed__));
+} PACKED;
 
 #define JFS_SUPERBLOCK_OFFSET			0x8000