volume_id: provide a custom debug function

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

diff --git a/extras/volume_id/libvolume_id/reiserfs.c b/extras/volume_id/libvolume_id/reiserfs.c
index 0eecbda5cb0d0da6bc844c8106898a9a714da22b..b5706f86e0ff9024e5a03bf63545a6ba306b2fa5 100644 (file)
--- a/extras/volume_id/libvolume_id/reiserfs.c
+++ b/extras/volume_id/libvolume_id/reiserfs.c
@@ -24,8 +24,7 @@
 #include <errno.h>
 #include <ctype.h>
 
-#include "volume_id.h"
-#include "logging.h"
+#include "libvolume_id.h"
 #include "util.h"
 
 struct reiserfs_super_block {
@@ -42,7 +41,7 @@ struct reiserfs_super_block {
        uint32_t        dummy4[5];
        uint8_t         uuid[16];
        uint8_t         label[16];
-} __attribute__((__packed__));
+} PACKED;
 
 struct reiser4_super_block {
        uint8_t         magic[16];
@@ -50,7 +49,7 @@ struct reiser4_super_block {
        uint8_t         uuid[16];
        uint8_t         label[16];
        uint64_t        dummy2;
-} __attribute__((__packed__));
+} PACKED;
 
 #define REISERFS1_SUPERBLOCK_OFFSET            0x2000
 #define REISERFS_SUPERBLOCK_OFFSET             0x10000