changeset 15405:7bc53777af61

sigpipe-die: use stdnoreturn.h * lib/sigpipe-die.h: Include <stdnoreturn.h>. (_GL_ATTRIBUTE_NORETURN): Remove; all uses replaced with noreturn. * modules/sigpipe-die (Depends-on): Add stdnoreturn.
author Paul Eggert <eggert@cs.ucla.edu>
date Tue, 12 Jul 2011 01:10:04 -0700
parents 8b6031ce6910
children 4abf2fc74920
files ChangeLog lib/sigpipe-die.h modules/sigpipe-die
diffstat 3 files changed, 8 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-07-12  Paul Eggert  <eggert@cs.ucla.edu>
 
+	sigpipe-die: use stdnoreturn.h
+	* lib/sigpipe-die.h: Include <stdnoreturn.h>.
+	(_GL_ATTRIBUTE_NORETURN): Remove; all uses replaced with noreturn.
+	* modules/sigpipe-die (Depends-on): Add stdnoreturn.
+
 	openat: use stdnoreturn.h
 	* lib/openat.h: Include <stdnoreturn.h>.
 	(_GL_ATTRIBUTE_NORETURN): Remove; all uses replaced with noreturn.
--- a/lib/sigpipe-die.h
+++ b/lib/sigpipe-die.h
@@ -41,21 +41,16 @@
 #ifndef _SIGPIPE_DIE_H
 #define _SIGPIPE_DIE_H
 
+#include <stdnoreturn.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 
-# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)
-#  define _GL_ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
-# else
-#  define _GL_ATTRIBUTE_NORETURN /* empty */
-# endif
-
 /* Emit an error message indicating a SIGPIPE signal, and terminate the
    process with an error code.  */
-extern void sigpipe_die (void) _GL_ATTRIBUTE_NORETURN;
+extern noreturn void sigpipe_die (void);
 
 /* Install a SIGPIPE handler that invokes PREPARE_DIE and then emits an
    error message and exits.  PREPARE_DIE may be NULL, meaning a no-op.  */
--- a/modules/sigpipe-die
+++ b/modules/sigpipe-die
@@ -12,6 +12,7 @@
 sigpipe
 sigprocmask
 sigaction
+stdnoreturn
 
 configure.ac: