--- ./plugins/lvm2/metadata.h.tv2	2005-11-16 17:37:35.000000000 +0100
+++ ./plugins/lvm2/metadata.h	2005-11-16 17:37:36.000000000 +0100
@@ -53,10 +53,10 @@
  * Specifies an area of the disk, given by absolute starting offset and size
  * of the area. Values are in bytes, not sectors.
  **/
-typedef struct disk_location {
+typedef struct __attribute__ ((packed)) disk_location {
 	u_int64_t	offset;
 	u_int64_t	size;
-} __attribute__ ((packed)) disk_location_t;
+} disk_location_t;
 
 /**
  * struct raw_location
@@ -65,12 +65,12 @@
  * Also includes a checksum of the specified location. Values are in bytes,
  * not sectors.
  **/
-typedef struct raw_location {
+typedef struct __attribute__ ((packed)) raw_location {
 	u_int64_t	offset;
 	u_int64_t	size;
 	u_int32_t	checksum;
 	u_int32_t	filler;
-} __attribute__ ((packed)) raw_location_t;
+} raw_location_t;
 
 /**
  * struct label_header
@@ -87,13 +87,13 @@
  *
  * Structure identifying the device as belonging to LVM2.
  **/
-typedef struct label_header {
+typedef struct __attribute__ ((packed)) label_header {
 	u_int8_t	id[8];
 	u_int64_t	sector;
 	u_int32_t	crc;
 	u_int32_t	offset;
 	u_int8_t	type[8];
-} __attribute__ ((packed)) label_header_t;
+} label_header_t;
 
 /**
  * struct pv_header
@@ -106,11 +106,11 @@
  *
  * "Label-type-specific" structure for LVM2 text-format.
  **/
-typedef struct pv_header {
+typedef struct __attribute__ ((packed)) pv_header {
 	u_int8_t		pv_uuid[LVM2_UUID_LEN];
 	u_int64_t		device_size;
 	struct disk_location	disk_areas[0];
-} __attribute__ ((packed)) pv_header_t;
+} pv_header_t;
 
 /**
  * struct mda_header
@@ -126,14 +126,14 @@
  *
  * This structure identifies the start of the VGDA section.
  **/
-typedef struct mda_header {
+typedef struct __attribute__ ((packed)) mda_header {
 	u_int32_t		checksum;
 	u_int8_t		magic[16];
 	u_int32_t		version;
 	u_int64_t		start;
 	u_int64_t		size;
 	struct raw_location	raw_locations[0];
-} __attribute__ ((packed)) mda_header_t;
+} mda_header_t;
 
 /**
  * Routines exported from metadata.c