X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=extras%2Fvolume_id%2Flibvolume_id%2Fudf.c;h=f0e0d419572d28e32dc00bcf102d3205d0dcfe61;hb=467546b586e9ae29ac168967f5cdaac696cadcfb;hp=fede1ce68ae161cbfa2c7a2fd4e89a22e7634e8c;hpb=accff726856a0b3258a413d823a534f4f437e6b2;p=elogind.git

diff --git a/extras/volume_id/libvolume_id/udf.c b/extras/volume_id/libvolume_id/udf.c
index fede1ce68..f0e0d4195 100644
--- a/extras/volume_id/libvolume_id/udf.c
+++ b/extras/volume_id/libvolume_id/udf.c
@@ -37,28 +37,28 @@ struct volume_descriptor {
 		uint16_t	crc;
 		uint16_t	crc_len;
 		uint32_t	location;
-	} __attribute__((__packed__)) tag;
+	} PACKED tag;
 	union {
 		struct anchor_descriptor {
 			uint32_t	length;
 			uint32_t	location;
-		} __attribute__((__packed__)) anchor;
+		} PACKED anchor;
 		struct primary_descriptor {
 			uint32_t	seq_num;
 			uint32_t	desc_num;
 			struct dstring {
 				uint8_t	clen;
 				uint8_t	c[31];
-			} __attribute__((__packed__)) ident;
-		} __attribute__((__packed__)) primary;
-	} __attribute__((__packed__)) type;
-} __attribute__((__packed__));
+			} PACKED ident;
+		} PACKED primary;
+	} PACKED type;
+} PACKED;
 
 struct volume_structure_descriptor {
 	uint8_t		type;
 	uint8_t		id[5];
 	uint8_t		version;
-} __attribute__((__packed__));
+} PACKED;
 
 #define UDF_VSD_OFFSET			0x8000