use __x__ formats for __attribute__ arguments; guenther@gac.edu

23 files changed, 88 insertions, 88 deletions

diff --git a/include/err.h b/include/err.h
index 9c6191e9390..e552939cce1 100644
--- a/include/err.h
+++ b/include/err.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: err.h,v 1.3 1997/09/21 10:45:32 niklas Exp $	*/
+/*	$OpenBSD: err.h,v 1.4 2000/12/06 17:18:42 deraadt Exp $	*/
 /*	$NetBSD: err.h,v 1.11 1994/10/26 00:55:52 cgd Exp $	*/
 
 /*-
@@ -52,21 +52,21 @@
 __BEGIN_DECLS
 
 __dead void	err __P((int, const char *, ...))
-			__attribute__((noreturn, format (printf, 2, 3)));
+			__attribute__((__noreturn__, __format__ (printf, 2, 3)));
 __dead void	verr __P((int, const char *, _BSD_VA_LIST_))
-			__attribute__((noreturn, format (printf, 2, 0)));
+			__attribute__((__noreturn__, __format__ (printf, 2, 0)));
 __dead void	errx __P((int, const char *, ...))
-			__attribute__((noreturn, format (printf, 2, 3)));
+			__attribute__((__noreturn__, __format__ (printf, 2, 3)));
 __dead void	verrx __P((int, const char *, _BSD_VA_LIST_))
-			__attribute__((noreturn, format (printf, 2, 0)));
+			__attribute__((__noreturn__, __format__ (printf, 2, 0)));
 void		warn __P((const char *, ...))
-			__attribute__((format (printf, 1, 2)));
+			__attribute__((__format__ (printf, 1, 2)));
 void		vwarn __P((const char *, _BSD_VA_LIST_))
-			__attribute__((format (printf, 1, 0)));
+			__attribute__((__format__ (printf, 1, 0)));
 void		warnx __P((const char *, ...))
-			__attribute__((format (printf, 1, 2)));
+			__attribute__((__format__ (printf, 1, 2)));
 void		vwarnx __P((const char *, _BSD_VA_LIST_))
-			__attribute__((format (printf, 1, 0)));
+			__attribute__((__format__ (printf, 1, 0)));
 
 #ifdef __indr_reference
 /*
@@ -74,21 +74,21 @@ void		vwarnx __P((const char *, _BSD_VA_LIST_))
  * versions of err*,warn* do not get used.
  */
 __dead void	_err __P((int, const char *, ...))
-			__attribute__((noreturn, format (printf, 2, 3)));
+			__attribute__((__noreturn__, __format__ (printf, 2, 3)));
 __dead void	_verr __P((int, const char *, _BSD_VA_LIST_))
-			__attribute__((noreturn, format (printf, 2, 0)));
+			__attribute__((__noreturn__, __format__ (printf, 2, 0)));
 __dead void	_errx __P((int, const char *, ...))
-			__attribute__((noreturn, format (printf, 2, 3)));
+			__attribute__((__noreturn__, __format__ (printf, 2, 3)));
 __dead void	_verrx __P((int, const char *, _BSD_VA_LIST_))
-			__attribute__((noreturn, format (printf, 2, 0)));
+			__attribute__((__noreturn__, __format__ (printf, 2, 0)));
 void		_warn __P((const char *, ...))
-			__attribute__((format (printf, 1, 2)));
+			__attribute__((__format__ (printf, 1, 2)));
 void		_vwarn __P((const char *, _BSD_VA_LIST_))
-			__attribute__((format (printf, 1, 0)));
+			__attribute__((__format__ (printf, 1, 0)));
 void		_warnx __P((const char *, ...))
-			__attribute__((format (printf, 1, 2)));
+			__attribute__((__format__ (printf, 1, 2)));
 void		_vwarnx __P((const char *, _BSD_VA_LIST_))
-			__attribute__((format (printf, 1, 0)));
+			__attribute__((__format__ (printf, 1, 0)));
 #endif
 
 __END_DECLS
diff --git a/include/stdio.h b/include/stdio.h
index f258dbaa31c..657802fecbb 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdio.h,v 1.14 2000/03/04 17:16:02 millert Exp $	*/
+/*	$OpenBSD: stdio.h,v 1.15 2000/12/06 17:18:42 deraadt Exp $	*/
 /*	$NetBSD: stdio.h,v 1.18 1996/04/25 18:29:21 jtc Exp $	*/
 
 /*-
@@ -303,7 +303,7 @@ __END_DECLS
 #if !defined (_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
 __BEGIN_DECLS
 int	 asprintf __P((char **, const char *, ...))
-		__attribute__((format (printf, 2, 3)));
+		__attribute__((__format__ (printf, 2, 3)));
 char	*fgetln __P((FILE *, size_t *));
 int	 fpurge __P((FILE *));
 int	 getw __P((FILE *));
@@ -314,15 +314,15 @@ void	 setbuffer __P((FILE *, char *, int));
 int	 setlinebuf __P((FILE *));
 char	*tempnam __P((const char *, const char *));
 int	 snprintf __P((char *, size_t, const char *, ...))
-		__attribute__((format (printf, 3, 4)));
+		__attribute__((__format__ (printf, 3, 4)));
 int	 vasprintf __P((char **, const char *, _BSD_VA_LIST_))
-		__attribute__((format (printf, 2, 0)));
+		__attribute__((__format__ (printf, 2, 0)));
 int	 vsnprintf __P((char *, size_t, const char *, _BSD_VA_LIST_))
-		__attribute__((format (printf, 3, 0)));
+		__attribute__((__format__ (printf, 3, 0)));
 int	 vscanf __P((const char *, _BSD_VA_LIST_))
-		__attribute__((format (scanf, 1, 0)));
+		__attribute__((__format__ (scanf, 1, 0)));
 int	 vsscanf __P((const char *, const char *, _BSD_VA_LIST_))
-		__attribute__((format (scanf, 2, 0)));
+		__attribute__((__format__ (scanf, 2, 0)));
 __END_DECLS
 
 /*
diff --git a/include/unistd.h b/include/unistd.h
index 847abb38881..fd9d40d1ea7 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unistd.h,v 1.33 2000/09/12 17:30:45 millert Exp $ */
+/*	$OpenBSD: unistd.h,v 1.34 2000/12/06 17:18:43 deraadt Exp $ */
 /*	$NetBSD: unistd.h,v 1.26.4.1 1996/05/28 02:31:51 mrg Exp $	*/
 
 /*-
@@ -56,7 +56,7 @@
 #endif
 
 __BEGIN_DECLS
-__dead void	 _exit __P((int)) __attribute__((noreturn));
+__dead void	 _exit __P((int)) __attribute__((__noreturn__));
 int	 access __P((const char *, int));
 unsigned int alarm __P((unsigned int));
 int	 chdir __P((const char *));
diff --git a/lib/libc_r/TEST/test.h b/lib/libc_r/TEST/test.h
index 24afe9d4b1a..9713b8218f3 100644
--- a/lib/libc_r/TEST/test.h
+++ b/lib/libc_r/TEST/test.h
@@ -9,12 +9,12 @@
 #include <stdarg.h>
 
 int	_thread_sys_write __P((int, const char*, size_t));
-__dead void _thread_sys__exit __P((int)) __attribute__((noreturn));
+__dead void _thread_sys__exit __P((int)) __attribute__((__noreturn__));
 
 static __dead void __vpanic __P((const char *, const char *, const char *, 
-	int, const char *, va_list)) __attribute__((noreturn));
+	int, const char *, va_list)) __attribute__((__noreturn__));
 static __dead void __panic __P((const char *, const char *, const char *,
-	int, const char *, ...)) __attribute__((noreturn));
+	int, const char *, ...)) __attribute__((__noreturn__));
 
 #if defined(__OpenBSD__) || defined(__FreeBSD__)
 #include <pthread.h>
diff --git a/lib/libc_r/include/pthread.h b/lib/libc_r/include/pthread.h
index bb49293c20b..c13bbc54d69 100644
--- a/lib/libc_r/include/pthread.h
+++ b/lib/libc_r/include/pthread.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE.
  *
- * $OpenBSD: pthread.h,v 1.11 2000/01/06 07:06:00 d Exp $
+ * $OpenBSD: pthread.h,v 1.12 2000/12/06 17:18:47 deraadt Exp $
  *
  * $FreeBSD: pthread.h,v 1.13 1999/07/31 08:36:07 rse Exp $
  */
@@ -237,7 +237,7 @@ int		pthread_create __P((pthread_t *, const pthread_attr_t *,
 			void *(*start_routine) (void *), void *));
 int		pthread_detach __P((pthread_t));
 int		pthread_equal __P((pthread_t, pthread_t));
-__dead void	pthread_exit __P((void *)) __attribute__((noreturn));
+__dead void	pthread_exit __P((void *)) __attribute__((__noreturn__));
 void		*pthread_getspecific __P((pthread_key_t));
 int		pthread_join __P((pthread_t, void **));
 int		pthread_key_create __P((pthread_key_t *,
diff --git a/lib/libc_r/uthread/pthread_private.h b/lib/libc_r/uthread/pthread_private.h
index 9cfcffd5ca2..79417040938 100644
--- a/lib/libc_r/uthread/pthread_private.h
+++ b/lib/libc_r/uthread/pthread_private.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pthread_private.h,v 1.20 2000/10/04 05:55:35 d Exp $	*/
+/*	$OpenBSD: pthread_private.h,v 1.21 2000/12/06 17:18:47 deraadt Exp $	*/
 /*
  * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>.
  * All rights reserved.
@@ -823,7 +823,7 @@ void	_waitq_remove(pthread_t pthread);
 void	_waitq_setactive(void);
 void	_waitq_clearactive(void);
 #endif
-__dead void _thread_exit(const char *, int, const char *) __attribute__((noreturn));
+__dead void _thread_exit(const char *, int, const char *) __attribute__((__noreturn__));
 void    *_thread_cleanup(pthread_t);
 void    _thread_cleanupspecific(void);
 void    _thread_dump_info(void);
@@ -986,7 +986,7 @@ pid_t   _thread_sys_fork(void);
 pid_t   _thread_sys_tcgetpgrp(int);
 ssize_t _thread_sys_read(int, void *, size_t);
 ssize_t _thread_sys_write(int, const void *, size_t);
-__dead void	_thread_sys__exit(int) __attribute__((noreturn));
+__dead void	_thread_sys__exit(int) __attribute__((__noreturn__));
 #endif
 
 /* #include <fcntl.h> */
diff --git a/lib/libcurses++/cursesw.h b/lib/libcurses++/cursesw.h
index d42e4e8597c..c76b04e9ba5 100644
--- a/lib/libcurses++/cursesw.h
+++ b/lib/libcurses++/cursesw.h
@@ -867,7 +867,7 @@ public:
     // Perform a scanw function from the window. This only works if you're
     // using the GNU C++ compiler.
 #if __GNUG__ >= 2
-    __attribute__ ((format (scanf, 2, 3)));
+    __attribute__ ((__format__ (scanf, 2, 3)));
 #else
   ;
 #endif
@@ -876,7 +876,7 @@ public:
     // Move the cursor to the requested position and then perform a scanw
     // from the window. This nly works if you're using the GNU C++ compiler.
 #if __GNUG__ >= 2
-    __attribute__ ((format (scanf, 4, 5)));
+    __attribute__ ((__format__ (scanf, 4, 5)));
 #else
   ;
 #endif
@@ -908,7 +908,7 @@ public:
   int            printw(const char* fmt, ...)
     // Do a formatted print to the window.
 #if __GNUG__ >= 2
-    __attribute__ ((format (printf, 2, 3)));
+    __attribute__ ((__format__ (printf, 2, 3)));
 #else
   ;
 #endif
@@ -916,7 +916,7 @@ public:
   int            printw(int y, int x, const char * fmt, ...)
     // Move the cursor and then do a formatted print to the window.
 #if __GNUG__ >= 2
-    __attribute__ ((format (printf, 4, 5)));
+    __attribute__ ((__format__ (printf, 4, 5)));
 #else
   ;
 #endif
diff --git a/lib/libcurses/curses.h b/lib/libcurses/curses.h
index 68d3224c0e3..e738eee8088 100644
--- a/lib/libcurses/curses.h
+++ b/lib/libcurses/curses.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: curses.h,v 1.55 2000/10/22 18:27:19 millert Exp $	*/
+/*	$OpenBSD: curses.h,v 1.56 2000/12/06 17:18:49 deraadt Exp $	*/
 
 /****************************************************************************
  * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc.              *
@@ -360,13 +360,13 @@ extern int wresize (WINDOW *, int, int);
  * passed (that's non-portable).
  */
 #ifdef	GCC_PRINTF
-#define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var)))
+#define GCC_PRINTFLIKE(fmt,var) __attribute__((__format__(printf,fmt,var)))
 #else
 #define GCC_PRINTFLIKE(fmt,var) /*nothing*/
 #endif
 
 #ifdef	GCC_SCANF
-#define GCC_SCANFLIKE(fmt,var)  __attribute__((format(scanf,fmt,var)))
+#define GCC_SCANFLIKE(fmt,var)  __attribute__((__format__(scanf,fmt,var)))
 #else
 #define GCC_SCANFLIKE(fmt,var)  /*nothing*/
 #endif
diff --git a/lib/libcurses/ncurses_cfg.h b/lib/libcurses/ncurses_cfg.h
index b5fc60b4c78..976152d7045 100644
--- a/lib/libcurses/ncurses_cfg.h
+++ b/lib/libcurses/ncurses_cfg.h
@@ -51,10 +51,10 @@
 #define CC_HAS_PROTOS 1
 #define CPP_HAS_PARAM_INIT 1
 #define ETIP_NEEDS_MATH_H 1
-#define GCC_NORETURN __attribute__((noreturn))
+#define GCC_NORETURN __attribute__((__noreturn__))
 #define GCC_PRINTF 1
 #define GCC_SCANF 1
-#define GCC_UNUSED __attribute__((unused))
+#define GCC_UNUSED __attribute__((__unused__))
 #define HAVE_BIG_CORE 1
 #define HAVE_BSD_CGETENT 1
 #define HAVE_CURSES_VERSION 1
diff --git a/lib/libpcap/gencode.h b/lib/libpcap/gencode.h
index 6447ea57484..563f85e325a 100644
--- a/lib/libpcap/gencode.h
+++ b/lib/libpcap/gencode.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gencode.h,v 1.7 2000/04/26 21:25:52 jakob Exp $	*/
+/*	$OpenBSD: gencode.h,v 1.8 2000/12/06 17:18:52 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996
@@ -20,7 +20,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @(#) $Header: /cvs/OpenBSD/src/lib/libpcap/gencode.h,v 1.7 2000/04/26 21:25:52 jakob Exp $ (LBL)
+ * @(#) $Header: /cvs/OpenBSD/src/lib/libpcap/gencode.h,v 1.8 2000/12/06 17:18:52 deraadt Exp $ (LBL)
  */
 
 /* Address qualifiers. */
@@ -179,7 +179,7 @@ struct block *gen_inbound(int);
 void bpf_optimize(struct block **);
 #ifdef __STDC__
 __dead void bpf_error(const char *, ...)
-    __attribute__((volatile, format (printf, 1, 2)));
+    __attribute__((volatile, __format__ (printf, 1, 2)));
 #endif
 
 void finish_parse(struct block *);
diff --git a/lib/libpthread/include/pthread.h b/lib/libpthread/include/pthread.h
index bb49293c20b..c13bbc54d69 100644
--- a/lib/libpthread/include/pthread.h
+++ b/lib/libpthread/include/pthread.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE.
  *
- * $OpenBSD: pthread.h,v 1.11 2000/01/06 07:06:00 d Exp $
+ * $OpenBSD: pthread.h,v 1.12 2000/12/06 17:18:47 deraadt Exp $
  *
  * $FreeBSD: pthread.h,v 1.13 1999/07/31 08:36:07 rse Exp $
  */
@@ -237,7 +237,7 @@ int		pthread_create __P((pthread_t *, const pthread_attr_t *,
 			void *(*start_routine) (void *), void *));
 int		pthread_detach __P((pthread_t));
 int		pthread_equal __P((pthread_t, pthread_t));
-__dead void	pthread_exit __P((void *)) __attribute__((noreturn));
+__dead void	pthread_exit __P((void *)) __attribute__((__noreturn__));
 void		*pthread_getspecific __P((pthread_key_t));
 int		pthread_join __P((pthread_t, void **));
 int		pthread_key_create __P((pthread_key_t *,
diff --git a/lib/libpthread/uthread/pthread_private.h b/lib/libpthread/uthread/pthread_private.h
index 9cfcffd5ca2..79417040938 100644
--- a/lib/libpthread/uthread/pthread_private.h
+++ b/lib/libpthread/uthread/pthread_private.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pthread_private.h,v 1.20 2000/10/04 05:55:35 d Exp $	*/
+/*	$OpenBSD: pthread_private.h,v 1.21 2000/12/06 17:18:47 deraadt Exp $	*/
 /*
  * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>.
  * All rights reserved.
@@ -823,7 +823,7 @@ void	_waitq_remove(pthread_t pthread);
 void	_waitq_setactive(void);
 void	_waitq_clearactive(void);
 #endif
-__dead void _thread_exit(const char *, int, const char *) __attribute__((noreturn));
+__dead void _thread_exit(const char *, int, const char *) __attribute__((__noreturn__));
 void    *_thread_cleanup(pthread_t);
 void    _thread_cleanupspecific(void);
 void    _thread_dump_info(void);
@@ -986,7 +986,7 @@ pid_t   _thread_sys_fork(void);
 pid_t   _thread_sys_tcgetpgrp(int);
 ssize_t _thread_sys_read(int, void *, size_t);
 ssize_t _thread_sys_write(int, const void *, size_t);
-__dead void	_thread_sys__exit(int) __attribute__((noreturn));
+__dead void	_thread_sys__exit(int) __attribute__((__noreturn__));
 #endif
 
 /* #include <fcntl.h> */
diff --git a/sys/arch/hppa/include/pdc.h b/sys/arch/hppa/include/pdc.h
index a94f22b434c..c4de3c03b5c 100644
--- a/sys/arch/hppa/include/pdc.h
+++ b/sys/arch/hppa/include/pdc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pdc.h,v 1.14 2000/06/07 17:27:41 mickey Exp $	*/
+/*	$OpenBSD: pdc.h,v 1.15 2000/12/06 17:18:57 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1990 mt Xinu, Inc.  All rights reserved.
@@ -91,7 +91,7 @@
 #define	IODC_MINIOSIZ	64		/* minimum buffer size for IODC call */
 #define	IODC_MAXIOSIZ	(64 * 1024)	/* maximum buffer size for IODC call */
 
-#define	PDC_ALIGNMENT	__attribute__ ((aligned(64)))
+#define	PDC_ALIGNMENT	__attribute__ ((__aligned__(64)))
 
 /*
  * The PDC Entry Points and their arguments...
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)
diff --git a/sys/arch/m68k/include/frame.h b/sys/arch/m68k/include/frame.h
index 77e6579ffda..26570d4a717 100644
--- a/sys/arch/m68k/include/frame.h
+++ b/sys/arch/m68k/include/frame.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: frame.h,v 1.5 1997/07/06 07:46:25 downsj Exp $	*/
+/*	$OpenBSD: frame.h,v 1.6 2000/12/06 17:19:00 deraadt Exp $	*/
 /*	$NetBSD: frame.h,v 1.15 1997/05/03 12:49:05 mycroft Exp $	*/
 
 /*
@@ -55,7 +55,7 @@ struct frame {
 		u_int	tf_pc;
 		u_short	tf_format:4,
 			tf_vector:12;
-	} __attribute__((packed)) F_t;
+	} __attribute__((__packed__)) F_t;
 	union F_u {
 		struct fmt2 {
 			u_int	f_iaddr;
diff --git a/sys/arch/sparc/include/bsd_openprom.h b/sys/arch/sparc/include/bsd_openprom.h
index 4b2862dc186..cf348ec062d 100644
--- a/sys/arch/sparc/include/bsd_openprom.h
+++ b/sys/arch/sparc/include/bsd_openprom.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bsd_openprom.h,v 1.5 1997/08/08 08:26:06 downsj Exp $	*/
+/*	$OpenBSD: bsd_openprom.h,v 1.6 2000/12/06 17:18:59 deraadt Exp $	*/
 /*	$NetBSD: bsd_openprom.h,v 1.11 1996/05/18 12:27:43 mrg Exp $ */
 
 /*
@@ -224,7 +224,7 @@ struct promvec {
 	void	(*pv_printf) __P((const char *fmt, ...));
 	void	(*pv_abort) __P((void));	/* L1-A abort */
 	int	*pv_ticks;		/* Ticks since last reset */
-	__dead void (*pv_halt) __P((void)) __attribute__((noreturn));/* Halt! */
+	__dead void (*pv_halt) __P((void)) __attribute__((__noreturn__));/* Halt! */
 	void	(**pv_synchook) __P((void));	/* "sync" command hook */
 
 	/*
diff --git a/sys/arch/sparc/include/oldmon.h b/sys/arch/sparc/include/oldmon.h
index ce1ee9dc0b5..c43b0ffdd8a 100644
--- a/sys/arch/sparc/include/oldmon.h
+++ b/sys/arch/sparc/include/oldmon.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: oldmon.h,v 1.4 1997/08/08 08:26:32 downsj Exp $	*/
+/*	$OpenBSD: oldmon.h,v 1.5 2000/12/06 17:19:00 deraadt Exp $	*/
 /*	$NetBSD: oldmon.h,v 1.11 1996/03/31 22:21:38 pk Exp $ */
 
 /*
@@ -235,7 +235,7 @@ struct om_vector {
 					/* Really struct pgmapent *  */
 
 	__dead void (*exitToMon)
-	    __P((void)) __attribute__((noreturn));/* Exit from user program */
+	    __P((void)) __attribute__((__noreturn__));/* Exit from user program */
 	u_char	**memorybitmap;		/* V1: &{0 or &bits} */
 	void	(*setcxsegmap)		/* Set seg in any context */
 		    __P((int, caddr_t, int));
diff --git a/sys/dev/isa/mcdreg.h b/sys/dev/isa/mcdreg.h
index 2afbe520e9f..effa19f7d25 100644
--- a/sys/dev/isa/mcdreg.h
+++ b/sys/dev/isa/mcdreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mcdreg.h,v 1.4 1999/01/23 01:13:12 espie Exp $	*/
+/*	$OpenBSD: mcdreg.h,v 1.5 2000/12/06 17:18:41 deraadt Exp $	*/
 /*	$NetBSD: mcdreg.h,v 1.8 1997/04/04 18:59:37 christos Exp $	*/
 
 /*
@@ -163,14 +163,14 @@ union mcd_qchninfo {
 		u_char	upccode[7];
 		u_char	junk[2];
 	} upc;
-} __attribute__((packed));
+} __attribute__((__packed__));
 
 struct mcd_volinfo {
 	bcd_t	trk_low;
 	bcd_t	trk_high;
 	bcd_t	vol_msf[3];
 	bcd_t	trk1_msf[3];
-} __attribute__((packed));
+} __attribute__((__packed__));
 
 struct mcd_result {
 	u_char	length;
@@ -185,7 +185,7 @@ struct mcd_result {
 		union mcd_qchninfo qchninfo;
 		struct mcd_volinfo volinfo;
 	} data;
-} __attribute__((packed));
+} __attribute__((__packed__));
 
 struct mcd_command {
 	u_char	opcode;
@@ -223,19 +223,19 @@ struct mcd_command {
 			u_char	data1, data2;
 		} config;
 	} data;
-} __attribute__((packed));
+} __attribute__((__packed__));
 
 struct mcd_mbox {
 	struct mcd_command cmd;
 	struct mcd_result res;
-} __attribute__((packed));
+} __attribute__((__packed__));
 
 struct mcd_volume {
 	u_char	v0l;
 	u_char	v0rs;
 	u_char	v0r;
 	u_char	v0ls;
-} __attribute__((packed));
+} __attribute__((__packed__));
 
 struct mcd_rawsector {
 	u_char	sync1[12];
@@ -244,4 +244,4 @@ struct mcd_rawsector {
 	u_char	subheader2[4];
 	u_char	data[MCD_BLKSIZE_COOKED];
 	u_char	ecc_bits[280];
-} __attribute__((packed));
+} __attribute__((__packed__));
diff --git a/sys/isofs/cd9660/iso.h b/sys/isofs/cd9660/iso.h
index 13ab6416620..f9b950957d6 100644
--- a/sys/isofs/cd9660/iso.h
+++ b/sys/isofs/cd9660/iso.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iso.h,v 1.9 1999/07/01 02:20:22 d Exp $	*/
+/*	$OpenBSD: iso.h,v 1.10 2000/12/06 17:18:42 deraadt Exp $	*/
 /*	$NetBSD: iso.h,v 1.20 1997/07/07 22:45:34 cgd Exp $	*/
 
 /*-
@@ -179,14 +179,14 @@ struct iso_extended_attributes {
 	u_char len_au			[ISODCL (247, 250)]; /* 723 */
 };
 
-static __inline int isonum_711 __P((u_char *)) __attribute__ ((unused));
-static __inline int isonum_712 __P((char *)) __attribute__ ((unused));
-static __inline int isonum_721 __P((u_char *)) __attribute__ ((unused));
-static __inline int isonum_722 __P((u_char *)) __attribute__ ((unused));
-static __inline int isonum_723 __P((u_char *)) __attribute__ ((unused));
-static __inline int isonum_731 __P((u_char *)) __attribute__ ((unused));
-static __inline int isonum_732 __P((u_char *)) __attribute__ ((unused));
-static __inline int isonum_733 __P((u_char *)) __attribute__ ((unused));
+static __inline int isonum_711 __P((u_char *)) __attribute__ ((__unused__));
+static __inline int isonum_712 __P((char *)) __attribute__ ((__unused__));
+static __inline int isonum_721 __P((u_char *)) __attribute__ ((__unused__));
+static __inline int isonum_722 __P((u_char *)) __attribute__ ((__unused__));
+static __inline int isonum_723 __P((u_char *)) __attribute__ ((__unused__));
+static __inline int isonum_731 __P((u_char *)) __attribute__ ((__unused__));
+static __inline int isonum_732 __P((u_char *)) __attribute__ ((__unused__));
+static __inline int isonum_733 __P((u_char *)) __attribute__ ((__unused__));
 
 /* 7.1.1: unsigned char */
 static __inline int
diff --git a/sys/netipx/ipx.h b/sys/netipx/ipx.h
index 2b7827c9404..3e7f40a38c3 100644
--- a/sys/netipx/ipx.h
+++ b/sys/netipx/ipx.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipx.h,v 1.13 2000/09/22 14:56:22 millert Exp $	*/
+/*	$OpenBSD: ipx.h,v 1.14 2000/12/06 17:19:01 deraadt Exp $	*/
 
 /*-
  *
@@ -111,7 +111,7 @@
  */
 #define IPX_HOSTADDRLEN	6
 #define IPX_NETADDRLEN	4
-#define XXX	__attribute__((packed))
+#define XXX	__attribute__((__packed__))
 
 typedef
 union ipx_host {
diff --git a/sys/netipx/spx.h b/sys/netipx/spx.h
index 46f72df40a2..9ee9c22f78d 100644
--- a/sys/netipx/spx.h
+++ b/sys/netipx/spx.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spx.h,v 1.3 1996/11/25 08:20:02 mickey Exp $	*/
+/*	$OpenBSD: spx.h,v 1.4 2000/12/06 17:19:01 deraadt Exp $	*/
 
 /*-
  *
@@ -45,7 +45,7 @@
 
 #include <sys/queue.h>
 
-#define	XXX	__attribute__((packed));
+#define	XXX	__attribute__((__packed__));
 
 /*
  * Definitions for IPX style Sequenced Packet Protocol
diff --git a/sys/uvm/uvm_extern.h b/sys/uvm/uvm_extern.h
index f3c2a65d15f..ec9158cf537 100644
--- a/sys/uvm/uvm_extern.h
+++ b/sys/uvm/uvm_extern.h
@@ -279,7 +279,7 @@ void			uvm_fork __P((struct proc *, struct proc *, boolean_t,
 void			uvm_exit __P((struct proc *));
 void			uvm_init_limits __P((struct proc *));
 boolean_t		uvm_kernacc __P((caddr_t, size_t, int));
-__dead void		uvm_scheduler __P((void)) __attribute__((noreturn));
+__dead void		uvm_scheduler __P((void)) __attribute__((__noreturn__));
 void			uvm_swapin __P((struct proc *));
 boolean_t		uvm_useracc __P((caddr_t, size_t, int));
 void			uvm_vslock __P((struct proc *, caddr_t, size_t,