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

9 files changed, 25 insertions, 25 deletions

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 a3479c5d3bb..4d2dc1dc909 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: /home/cvs/src/lib/libpcap/gencode.h,v 1.7 2000/04/26 21:25:52 jakob Exp $ (LBL)
+ * @(#) $Header: /home/cvs/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> */