volume_id: provide a custom debug function

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

diff --git a/extras/volume_id/libvolume_id/ext.c b/extras/volume_id/libvolume_id/ext.c
index d1f62dfb6f99ddae2a14ec1415ca1d6036f8be38..51c0011218f5ac1551acdd3d40f62f4d686344a2 100644 (file)
--- a/extras/volume_id/libvolume_id/ext.c
+++ b/extras/volume_id/libvolume_id/ext.c
@@ -23,9 +23,8 @@
 #include <errno.h>
 #include <ctype.h>
 
-#include "volume_id.h"
+#include "libvolume_id.h"
 #include "util.h"
-#include "logging.h"
 
 struct ext2_super_block {
        uint32_t        s_inodes_count;
@@ -61,7 +60,7 @@ struct ext2_super_block {
        uint32_t        s_feature_ro_compat;
        uint8_t         s_uuid[16];
        uint8_t         s_volume_name[16];
-} __attribute__((__packed__));
+} PACKED;
 
 #define EXT_SUPER_MAGIC                                0xEF53
 #define EXT3_FEATURE_COMPAT_HAS_JOURNAL                0x00000004