diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2000-12-06 17:19:02 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2000-12-06 17:19:02 +0000 |
| commit | f3a240ca8c81a2aaacfe850d2ea6d470be9c69f0 (patch) | |
| tree | 67f580f89ee92012d481f5f1323870404749c7f9 /sys/arch/i386 | |
| parent | e1a1e49b6d8f502fccd06d6369cb83e0ed290131 (diff) | |
use __x__ formats for __attribute__ arguments; guenther@gac.edu
Diffstat (limited to 'sys/arch/i386')
| -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 a985b4b7555..7b288a7b0a6 100644 --- a/sys/arch/i386/include/disklabel.h +++ b/sys/arch/i386/include/disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.h,v 1.22 1999/12/04 03:35:57 deraadt Exp $ */ +/* $OpenBSD: disklabel.h,v 1.23 2000/12/06 17:18:58 deraadt Exp $ */ /* $NetBSD: disklabel.h,v 1.3 1996/03/09 20:52:54 ghudson Exp $ */ /* @@ -78,7 +78,7 @@ struct dos_mbr { u_int8_t dmbr_boot[DOSPARTOFF]; struct dos_partition dmbr_parts[NDOSPART]; u_int16_t dmbr_sign; -} __attribute__((packed)); +} __attribute__((__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 979e880fb88..df535490c22 100644 --- a/sys/arch/i386/include/segments.h +++ b/sys/arch/i386/include/segments.h @@ -1,4 +1,4 @@ -/* $OpenBSD: segments.h,v 1.7 2000/08/05 22:07:32 niklas Exp $ */ +/* $OpenBSD: segments.h,v 1.8 2000/12/06 17:18:58 deraadt Exp $ */ /* $NetBSD: segments.h,v 1.23 1996/02/01 22:31:03 mycroft Exp $ */ /*- @@ -91,7 +91,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)); +} __attribute__((__packed__)); /* * Gate descriptors (e.g. indirect descriptors) @@ -105,7 +105,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)); +} __attribute__((__packed__)); /* * Generic descriptor @@ -113,7 +113,7 @@ struct gate_descriptor { union descriptor { struct segment_descriptor sd; struct gate_descriptor gd; -} __attribute__((packed)); +} __attribute__((__packed__)); /* * region descriptors, used to load gdt/idt tables before segments yet exist. @@ -121,7 +121,7 @@ union descriptor { struct region_descriptor { unsigned rd_limit:16; /* segment extent */ unsigned rd_base:32; /* base address */ -} __attribute__((packed)); +} __attribute__((__packed__)); #if __GNUC__ == 2 && __GNUC_MINOR__ < 7 #pragma pack(4) |