convert __attribute__((__packed__)) to __packed so that parsers unaware

of gcc extensions have more of a chance.
ok mcbride@, no objections from millert@, deraadt@

3 files changed, 11 insertions, 11 deletions

diff --git a/sys/arch/i386/include/disklabel.h b/sys/arch/i386/include/disklabel.h
index 0f22355259d..190a38ed616 100644
--- a/sys/arch/i386/include/disklabel.h
+++ b/sys/arch/i386/include/disklabel.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disklabel.h,v 1.25 2003/01/06 01:31:42 weingart Exp $	*/
+/*	$OpenBSD: disklabel.h,v 1.26 2003/11/16 20:30:06 avsm Exp $	*/
 /*	$NetBSD: disklabel.h,v 1.3 1996/03/09 20:52:54 ghudson Exp $	*/
 
 /*
@@ -79,7 +79,7 @@ struct dos_mbr {
 	u_int8_t		dmbr_boot[DOSPARTOFF];
 	struct dos_partition	dmbr_parts[NDOSPART];
 	u_int16_t		dmbr_sign;
-} __attribute__((__packed__));
+} __packed;
 
 #define DOSMBR_SIGNATURE	(0xaa55)
 #define DOSMBR_SIGNATURE_OFF	(0x1fe)
diff --git a/sys/arch/i386/include/segments.h b/sys/arch/i386/include/segments.h
index b7863d819e4..ac01a2a2e26 100644
--- a/sys/arch/i386/include/segments.h
+++ b/sys/arch/i386/include/segments.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: segments.h,v 1.11 2003/06/02 23:27:47 millert Exp $	*/
+/*	$OpenBSD: segments.h,v 1.12 2003/11/16 20:30:06 avsm Exp $	*/
 /*	$NetBSD: segments.h,v 1.23 1996/02/01 22:31:03 mycroft Exp $	*/
 
 /*-
@@ -87,7 +87,7 @@ struct segment_descriptor {
 	unsigned sd_def32:1;		/* default 32 vs 16 bit size */
 	unsigned sd_gran:1;		/* limit granularity (byte/page) */
 	unsigned sd_hibase:8;		/* segment base address (msb) */
-} __attribute__((__packed__));
+} __packed;
 
 /*
  * Gate descriptors (e.g. indirect descriptors)
@@ -101,7 +101,7 @@ struct gate_descriptor {
 	unsigned gd_dpl:2;		/* segment descriptor priority level */
 	unsigned gd_p:1;		/* segment descriptor present */
 	unsigned gd_hioffset:16;	/* gate offset (msb) */
-} __attribute__((__packed__));
+} __packed;
 
 /*
  * Generic descriptor
@@ -109,7 +109,7 @@ struct gate_descriptor {
 union descriptor {
 	struct segment_descriptor sd;
 	struct gate_descriptor gd;
-} __attribute__((__packed__));
+} __packed;
 
 /*
  * region descriptors, used to load gdt/idt tables before segments yet exist.
@@ -117,7 +117,7 @@ union descriptor {
 struct region_descriptor {
 	unsigned rd_limit:16;		/* segment extent */
 	unsigned rd_base:32;		/* base address  */
-} __attribute__((__packed__));
+} __packed;
 
 #if __GNUC__ == 2 && __GNUC_MINOR__ < 7
 #pragma pack(4)
diff --git a/sys/arch/i386/pci/pcibiosvar.h b/sys/arch/i386/pci/pcibiosvar.h
index 48bb39081ad..e00e38a8910 100644
--- a/sys/arch/i386/pci/pcibiosvar.h
+++ b/sys/arch/i386/pci/pcibiosvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcibiosvar.h,v 1.11 2003/07/30 05:26:33 mickey Exp $	*/
+/*	$OpenBSD: pcibiosvar.h,v 1.12 2003/11/16 20:30:06 avsm Exp $	*/
 /*	$NetBSD: pcibios.h,v 1.2 2000/04/28 17:15:16 uch Exp $	*/
 
 /*
@@ -72,7 +72,7 @@ struct pcibios_softc {
 struct pcibios_linkmap {
 	u_int8_t	link;
 	u_int16_t	bitmap;
-} __attribute__((__packed__));
+} __packed;
 
 struct pcibios_intr_routing {
 	u_int8_t	bus;
@@ -80,7 +80,7 @@ struct pcibios_intr_routing {
 	struct pcibios_linkmap linkmap[4];	/* INT[A:D]# */
 	u_int8_t	slot;
 	u_int8_t	reserved;
-} __attribute__((__packed__));
+} __packed;
 
 /*
  * $PIR header.  Reference:
@@ -98,7 +98,7 @@ struct pcibios_pir_header {
 	u_int32_t	miniport;
 	u_int8_t	reserved[11];
 	u_int8_t	checksum;
-} __attribute__((__packed__));
+} __packed;
 
 #define	PIR_DEVFUNC_DEVICE(devfunc)	(((devfunc) >> 3) & 0x1f)
 #define	PIR_DEVFUNC_FUNCTION(devfunc)	((devfunc) & 7)