* lib/sigpipe-die.h: Include <stdnoreturn.h>.
(_GL_ATTRIBUTE_NORETURN): Remove; all uses replaced with noreturn.
* modules/sigpipe-die (Depends-on): Add stdnoreturn.
---
ChangeLog | 5 +++++
lib/sigpipe-die.h | 9 ++-------
modules/sigpipe-die | 1 +
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index aa37a49..9d45f7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2011-07-10 Paul Eggert <egg...@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 91565bc..c103099 100644
--- 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 7229665..90b477a 100644
--- a/modules/sigpipe-die
+++ b/modules/sigpipe-die
@@ -12,6 +12,7 @@ exitfail
sigpipe
sigprocmask
sigaction
+stdnoreturn
configure.ac:
--
1.7.4.4
