diff options
| -rw-r--r-- | lib/libc/locale/runetype.h | 8 | ||||
| -rw-r--r-- | regress/usr.bin/xlint/test-11.c | 8 | ||||
| -rw-r--r-- | sbin/iopctl/iopctl.c | 6 | ||||
| -rw-r--r-- | usr.sbin/acpidump/acpidump.h | 14 | ||||
| -rw-r--r-- | usr.sbin/acpidump/aml/aml_memman.h | 10 |
5 files changed, 23 insertions, 23 deletions
diff --git a/lib/libc/locale/runetype.h b/lib/libc/locale/runetype.h index a1635652682..57683a1e41a 100644 --- a/lib/libc/locale/runetype.h +++ b/lib/libc/locale/runetype.h @@ -1,7 +1,7 @@ #ifndef _NB_RUNETYPE_H_ #define _NB_RUNETYPE_H_ -/* $OpenBSD: runetype.h,v 1.4 2005/08/08 05:53:01 espie Exp $ */ +/* $OpenBSD: runetype.h,v 1.5 2007/10/08 08:17:15 gilles Exp $ */ /* $NetBSD: runetype.h,v 1.18 2003/08/07 16:43:04 agc Exp $ */ /*- * Copyright (c) 1993 @@ -84,12 +84,12 @@ typedef struct { int32_t fre_min; /* First rune of the range */ int32_t fre_max; /* Last rune (inclusive) of the range */ int32_t fre_map; /* What first maps to in maps */ -} __attribute__((__packed__)) _FileRuneEntry; +} __packed _FileRuneEntry; typedef struct { uint32_t frr_nranges; /* Number of ranges stored */ -} __attribute__((__packed__)) _FileRuneRange; +} __packed _FileRuneRange; typedef struct { @@ -114,7 +114,7 @@ typedef struct { int32_t frl_variable_len;/* how long that data is */ /* variable size data follows */ -} __attribute__((__packed__)) _FileRuneLocale; +} __packed _FileRuneLocale; /* diff --git a/regress/usr.bin/xlint/test-11.c b/regress/usr.bin/xlint/test-11.c index 510906bc0f8..1df0073680d 100644 --- a/regress/usr.bin/xlint/test-11.c +++ b/regress/usr.bin/xlint/test-11.c @@ -1,4 +1,4 @@ -/* $OpenBSD: test-11.c,v 1.2 2005/12/03 01:04:06 cloder Exp $ */ +/* $OpenBSD: test-11.c,v 1.3 2007/10/08 08:18:35 gilles Exp $ */ /* * Placed in the public domain by Chad Loder <cloder@openbsd.org>. @@ -78,8 +78,8 @@ foo9(void) */ typedef struct mystruct { - unsigned char c_data[128] __attribute__((__packed__)); - unsigned int u_data[128] __attribute__((__packed__)); + unsigned char c_data[128] __packed; + unsigned int u_data[128] __packed; } mystruct_t; @@ -88,7 +88,7 @@ struct mystruct { */ struct mystruct2 { unsigned char c_data[128]; -} __attribute__((__packed__)); +} __packed; /* * A typedef with an attribute after the typename. diff --git a/sbin/iopctl/iopctl.c b/sbin/iopctl/iopctl.c index 7ce3b47623e..b775a715dc0 100644 --- a/sbin/iopctl/iopctl.c +++ b/sbin/iopctl/iopctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iopctl.c,v 1.7 2004/08/20 19:48:53 mickey Exp $ */ +/* $OpenBSD: iopctl.c,v 1.8 2007/10/08 08:19:40 gilles Exp $ */ /* $NetBSD: iopctl.c,v 1.12 2002/01/04 10:17:20 ad Exp $ */ /*- @@ -202,7 +202,7 @@ getparam(int tid, int group, void *pbuf, int pbufsize) struct { struct i2o_param_op_list_header olh; struct i2o_param_op_all_template oat; - } __attribute__ ((__packed__)) req; + } __packed req; mb.msgflags = I2O_MSGFLAGS(i2o_util_params_op); mb.msgfunc = I2O_MSGFUNC(tid, I2O_UTIL_PARAMS_GET); @@ -363,7 +363,7 @@ showdevid(char **argv) struct i2o_param_read_results prr; struct i2o_param_device_identity di; char padding[128]; - } __attribute__ ((__packed__)) p; + } __packed p; char ident[128]; getparam(gettid(argv), I2O_PARAM_DEVICE_IDENTITY, &p, sizeof(p)); diff --git a/usr.sbin/acpidump/acpidump.h b/usr.sbin/acpidump/acpidump.h index b090218d4cd..682f20c0a39 100644 --- a/usr.sbin/acpidump/acpidump.h +++ b/usr.sbin/acpidump/acpidump.h @@ -1,4 +1,4 @@ -/* $OpenBSD: acpidump.h,v 1.2 2005/06/04 02:25:53 cloder Exp $ */ +/* $OpenBSD: acpidump.h,v 1.3 2007/10/08 08:20:49 gilles Exp $ */ /*- * Copyright (c) 1999 Doug Rabson * Copyright (c) 2000 Mitsuru IWASAKI <iwasaki@FreeBSD.org> @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: acpidump.h,v 1.2 2005/06/04 02:25:53 cloder Exp $ + * $Id: acpidump.h,v 1.3 2007/10/08 08:20:49 gilles Exp $ * $FreeBSD: src/usr.sbin/acpi/acpidump/acpidump.h,v 1.2 2000/11/08 02:37:00 iwasaki Exp $ */ @@ -48,7 +48,7 @@ struct ACPIgas { u_int8_t register_bit_offset; u_int8_t res; u_int64_t address; -} __attribute__((packed)); +} __packed; /* Root System Description Pointer */ struct ACPIrsdp { @@ -57,7 +57,7 @@ struct ACPIrsdp { u_char oem[6]; u_char res; u_int32_t addr; -} __attribute__((packed)); +} __packed; /* System Description Table */ struct ACPIsdt { @@ -72,7 +72,7 @@ struct ACPIsdt { u_int32_t crerev; #define SIZEOF_SDT_HDR 36 /* struct size except body */ u_int32_t body[1];/* This member should be casted */ -} __attribute__((packed)); +} __packed; /* Fixed ACPI Description Table (body) */ struct FACPbody { @@ -139,7 +139,7 @@ struct FACPbody { struct ACPIgas x_pm_tmr_blk; struct ACPIgas x_gpe0_blk; struct ACPIgas x_gpe1_blk; -} __attribute__((packed)); +} __packed; /* Firmware ACPI Control Structure */ struct FACS { @@ -158,7 +158,7 @@ struct FACS { u_int32_t flags; /* bit field */ #define ACPI_FACS_FLAG_S4BIOS_F 1 /* Supports S4BIOS_SEQ */ char reserved[40]; -} __attribute__((packed)); +} __packed; void *acpi_map_physical(vm_offset_t, size_t); struct ACPIrsdp *acpi_find_rsd_ptr(void); diff --git a/usr.sbin/acpidump/aml/aml_memman.h b/usr.sbin/acpidump/aml/aml_memman.h index 6018db1804f..0f54d4a202c 100644 --- a/usr.sbin/acpidump/aml/aml_memman.h +++ b/usr.sbin/acpidump/aml/aml_memman.h @@ -1,4 +1,4 @@ -/* $OpenBSD: aml_memman.h,v 1.2 2006/02/06 21:46:40 jmc Exp $ */ +/* $OpenBSD: aml_memman.h,v 1.3 2007/10/08 08:20:49 gilles Exp $ */ /*- * Copyright (c) 1999, 2000 Mitsuru IWASAKI <iwasaki@FreeBSD.org> * All rights reserved. @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: aml_memman.h,v 1.2 2006/02/06 21:46:40 jmc Exp $ + * $Id: aml_memman.h,v 1.3 2007/10/08 08:20:49 gilles Exp $ * $FreeBSD: src/usr.sbin/acpi/amldb/aml/aml_memman.h,v 1.1 2000/08/24 09:33:08 takawata Exp $ */ @@ -47,7 +47,7 @@ struct memman_block { unsigned int available; /* number of available chunks */ unsigned int allocated_mem; /* block + misc (in bytes) */ -}__attribute__((packed)); +} __packed; LIST_HEAD(memman_block_list, memman_block); @@ -56,7 +56,7 @@ struct memman_node { LIST_ENTRY(memman_node) links; void *node; struct memman_block *memblock; -}__attribute__((packed)); +} __packed; LIST_HEAD(memman_node_list, memman_node); @@ -87,7 +87,7 @@ struct memman_flexmem_info { LIST_ENTRY(memman_flexmem_info) links; void *addr; size_t mem_size; -}__attribute__((packed)); +} __packed; LIST_HEAD(memman_flexmem_info_list, memman_flexmem_info); |