volume_id: provide library

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

diff --git a/extras/volume_id/libvolume_id/ntfs.c b/extras/volume_id/libvolume_id/ntfs.c
index de9ad6d654b508d0d9b4b007b46bc4f4a839b32c..a46359268eb55ed35e4ddb0f5221d13cd9501701 100644 (file)
--- a/extras/volume_id/libvolume_id/ntfs.c
+++ b/extras/volume_id/libvolume_id/ntfs.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 
-#include "volume_id.h"
+#include "libvolume_id.h"
 #include "logging.h"
 #include "util.h"
 
@@ -52,7 +52,7 @@ struct ntfs_super_block {
        uint8_t         reserved2[3];
        uint8_t         volume_serial[8];
        uint16_t        checksum;
-} __attribute__((__packed__)) *ns;
+} PACKED *ns;
 
 struct master_file_table_record {
        uint8_t         magic[4];
@@ -65,7 +65,7 @@ struct master_file_table_record {
        uint16_t        flags;
        uint32_t        bytes_in_use;
        uint32_t        bytes_allocated;
-} __attribute__((__packed__)) *mftr;
+} PACKED *mftr;
 
 struct file_attribute {
        uint32_t        type;
@@ -77,13 +77,13 @@ struct file_attribute {
        uint16_t        instance;
        uint32_t        value_len;
        uint16_t        value_offset;
-} __attribute__((__packed__)) *attr;
+} PACKED *attr;
 
 struct volume_info {
        uint64_t        reserved;
        uint8_t         major_ver;
        uint8_t         minor_ver;
-} __attribute__((__packed__)) *info;
+} PACKED *info;
 
 #define MFT_RECORD_VOLUME                      3
 #define MFT_RECORD_ATTR_VOLUME_NAME            0x60