From f8866156501ef250a23f2fb7f383f4971ff9c72a Mon Sep 17 00:00:00 2001
From: mycroft <mycroft@NetBSD.org>
Date: Thu, 30 Jul 1998 00:44:15 +0000
Subject: [PATCH] __Namespace__ __protection__.

---
 include/err.h    | 18 +++++++++---------
 include/stdio.h  | 10 +++++-----
 include/stdlib.h |  6 +++---
 include/unistd.h |  4 ++--
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/include/err.h b/include/err.h
index b903562a20e0..c204895748d6 100644
--- a/include/err.h
+++ b/include/err.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: err.h,v 1.11 1994/10/26 00:55:52 cgd Exp $	*/
+/*	$NetBSD: err.h,v 1.12 1998/07/30 00:44:15 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -50,21 +50,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)));
 __END_DECLS
 
 #endif /* !_ERR_H_ */
diff --git a/include/stdio.h b/include/stdio.h
index db1e343a0ca7..624bba180adb 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: stdio.h,v 1.25 1998/07/27 13:35:00 mycroft Exp $	*/
+/*	$NetBSD: stdio.h,v 1.26 1998/07/30 00:44:16 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -311,9 +311,9 @@ __BEGIN_DECLS
 int	 getw __P((FILE *));
 int	 putw __P((int, FILE *));
 int	 snprintf __P((char *, size_t, const char *, ...))
-		__attribute__((format (printf, 3, 4)));
+	    __attribute__((__format__(__printf__, 3, 4)));
 int	 vsnprintf __P((char *, size_t, const char *, _BSD_VA_LIST_))
-		__attribute__((format (printf, 3, 0)));
+	    __attribute__((__format__(__printf__, 3, 0)));
 
 #ifndef __AUDIT__
 char	*tempnam __P((const char *, const char *));
@@ -332,9 +332,9 @@ int	 fpurge __P((FILE *));
 void	 setbuffer __P((FILE *, char *, int));
 int	 setlinebuf __P((FILE *));
 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/stdlib.h b/include/stdlib.h
index 2da3e27b2a8d..657e8310719e 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: stdlib.h,v 1.40 1998/07/28 00:28:29 mycroft Exp $	*/
+/*	$NetBSD: stdlib.h,v 1.41 1998/07/30 00:44:16 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -94,7 +94,7 @@ extern int __mb_cur_max;
 #endif
 
 __BEGIN_DECLS
-__dead	 void abort __P((void)) __attribute__((noreturn));
+__dead	 void abort __P((void)) __attribute__((__noreturn__));
 __pure	 int abs __P((int));
 int	 atexit __P((void (*)(void)));
 double	 atof __P((const char *));
@@ -104,7 +104,7 @@ void	*bsearch __P((const void *, const void *, size_t,
 	    size_t, int (*)(const void *, const void *)));
 void	*calloc __P((size_t, size_t));
 div_t	 div __P((int, int));
-__dead	 void exit __P((int)) __attribute__((noreturn));
+__dead	 void exit __P((int)) __attribute__((__noreturn__));
 void	 free __P((void *));
 __aconst char *getenv __P((const char *));
 __pure long
diff --git a/include/unistd.h b/include/unistd.h
index b97cc58d6419..860d27c09f0b 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: unistd.h,v 1.65 1998/07/28 00:28:29 mycroft Exp $	*/
+/*	$NetBSD: unistd.h,v 1.66 1998/07/30 00:44:16 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -92,7 +92,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 *));