diff options
| author | Anil Madhavapeddy <avsm@cvs.openbsd.org> | 2003-11-16 20:30:08 +0000 |
|---|---|---|
| committer | Anil Madhavapeddy <avsm@cvs.openbsd.org> | 2003-11-16 20:30:08 +0000 |
| commit | 4e13879e64b64a3bf17cb067b974522e66b3a70e (patch) | |
| tree | 46805a15b406a5fde2f0d261f52111f68d5a812d /sys/arch/i386/include | |
| parent | 95c782cbe9adab15695a4d56e505761194cc49ee (diff) | |
convert __attribute__((__packed__)) to __packed so that parsers unaware
of gcc extensions have more of a chance.
ok mcbride@, no objections from millert@, deraadt@
Diffstat (limited to 'sys/arch/i386/include')
| -rw-r--r-- | sys/arch/i386/include/disklabel.h | 4 | ||||
| -rw-r--r-- | sys/arch/i386/include/segments.h | 10 |
2 files changed, 7 insertions, 7 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) |