From bb68e62e46f9bd96269768d8564ff82463c2c0c8 Mon Sep 17 00:00:00 2001
From: millert <>
Date: Tue, 7 Aug 2001 21:34:42 +0000
Subject: [PATCH] remove redundant __noreturn__ attributes now that __dead is
 sane for modern gcc

---
 src/include/err.h    | 18 +++++++++---------
 src/include/unistd.h |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/include/err.h b/src/include/err.h
index cd81b8b0..d4942813 100644
--- a/src/include/err.h
+++ b/src/include/err.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: err.h,v 1.6 2001/07/19 15:06:22 espie Exp $	*/
+/*	$OpenBSD: err.h,v 1.7 2001/08/07 21:34:42 millert Exp $	*/
 /*	$NetBSD: err.h,v 1.11 1994/10/26 00:55:52 cgd Exp $	*/
 
 /*-
@@ -52,13 +52,13 @@
 __BEGIN_DECLS
 
 __dead void	err __P((int, const char *, ...))
-			__attribute__((__noreturn__, __format__ (printf, 2, 3)));
+			__attribute__((__format__ (printf, 2, 3)));
 __dead void	verr __P((int, const char *, _BSD_VA_LIST_))
-			__attribute__((__noreturn__, __format__ (printf, 2, 0)));
+			__attribute__((__format__ (printf, 2, 0)));
 __dead void	errx __P((int, const char *, ...))
-			__attribute__((__noreturn__, __format__ (printf, 2, 3)));
+			__attribute__((__format__ (printf, 2, 3)));
 __dead void	verrx __P((int, const char *, _BSD_VA_LIST_))
-			__attribute__((__noreturn__, __format__ (printf, 2, 0)));
+			__attribute__((__format__ (printf, 2, 0)));
 void		warn __P((const char *, ...))
 			__attribute__((__format__ (printf, 1, 2)));
 void		vwarn __P((const char *, _BSD_VA_LIST_))
@@ -73,13 +73,13 @@ 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__((__format__ (printf, 2, 3)));
 __dead void	_verr __P((int, const char *, _BSD_VA_LIST_))
-			__attribute__((__noreturn__, __format__ (printf, 2, 0)));
+			__attribute__((__format__ (printf, 2, 0)));
 __dead void	_errx __P((int, const char *, ...))
-			__attribute__((__noreturn__, __format__ (printf, 2, 3)));
+			__attribute__((__format__ (printf, 2, 3)));
 __dead void	_verrx __P((int, const char *, _BSD_VA_LIST_))
-			__attribute__((__noreturn__, __format__ (printf, 2, 0)));
+			__attribute__((__format__ (printf, 2, 0)));
 void		_warn __P((const char *, ...))
 			__attribute__((__format__ (printf, 1, 2)));
 void		_vwarn __P((const char *, _BSD_VA_LIST_))
diff --git a/src/include/unistd.h b/src/include/unistd.h
index fd9d40d1..01d71c99 100644
--- a/src/include/unistd.h
+++ b/src/include/unistd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unistd.h,v 1.34 2000/12/06 17:18:43 deraadt Exp $ */
+/*	$OpenBSD: unistd.h,v 1.35 2001/08/07 21:34:42 millert 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));
 int	 access __P((const char *, int));
 unsigned int alarm __P((unsigned int));
 int	 chdir __P((const char *));