===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/include/err.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- src/include/err.h	1997/09/21 10:45:32	1.3
+++ src/include/err.h	2000/12/06 17:18:42	1.4
@@ -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 @@
  * 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