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.

diff --git a/ChangeLog b/ChangeLog
index 40c5990139e21a53b1e69991806339f69edb6bf3..1ccafeb0504c8bf2cf33b2ea408bef6233b54dba 100644 (file)
--- 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.

diff --git a/lib/sigpipe-die.h b/lib/sigpipe-die.h
index 91565bcf5e6e806fc74c82bf6a1b940ba8408e06..c103099cd5c6d65474d6d537cc68a7231a0db248 100644 (file)
--- 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.  */

diff --git a/modules/sigpipe-die b/modules/sigpipe-die
index 722966568f0a49fdfbb98551eee7daf879f26cc3..90b477a9e5d1d60244177ada1863dda858f2967b 100644 (file)
--- a/modules/sigpipe-die
+++ b/modules/sigpipe-die
@@ -12,6 +12,7 @@ exitfail
 sigpipe
 sigprocmask
 sigaction
+stdnoreturn
 
 configure.ac: