#include <errno.h>
#include <ctype.h>
-#include "volume_id.h"
+#include "libvolume_id.h"
#include "logging.h"
#include "util.h"
uint16_t s_magic;
uint16_t s_state;
uint32_t s_zones;
-} __attribute__((__packed__));
+} PACKED;
#define MINIX_SUPERBLOCK_OFFSET 0x400