volume_id: provide a custom debug function

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

diff --git a/extras/volume_id/libvolume_id/jfs.c b/extras/volume_id/libvolume_id/jfs.c
index b6ae9624d677ee81dd6fdd98a03d51864c33997b..b230fb258c49ad933764853b1a1ff221d45ad566 100644 (file)
--- 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