volume_id: provide a custom debug function

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

diff --git a/extras/volume_id/libvolume_id/sysv.c b/extras/volume_id/libvolume_id/sysv.c
index fc874d5beaa95b96a147f479afc5d5e254e59ffd..52349c0623961a264a4e7086b606b7c0b04fb5aa 100644 (file)
--- a/extras/volume_id/libvolume_id/sysv.c
+++ b/extras/volume_id/libvolume_id/sysv.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 SYSV_NICINOD                   100
@@ -56,7 +55,7 @@ struct sysv_super
        uint32_t        s_state;
        uint32_t        s_magic;
        uint32_t        s_type;
-} __attribute__((__packed__));
+} PACKED;
 
 #define XENIX_NICINOD                          100
 #define XENIX_NICFREE                          100
@@ -82,7 +81,7 @@ struct xenix_super {
        uint8_t         s_fill[371];
        uint32_t        s_magic;
        uint32_t        s_type;
-} __attribute__((__packed__));
+} PACKED;
 
 #define SYSV_SUPERBLOCK_BLOCK                  0x01
 #define SYSV_MAGIC                             0xfd187e20