Merge commit 'b572c3a256e7bf1e4eecc8c36448c08093240a6a' into stable

[gnulib.git] / lib / sigpipe-die.h

diff --git a/lib/sigpipe-die.h b/lib/sigpipe-die.h
index e725c16..2e1ac27 100644 (file)
--- a/lib/sigpipe-die.h
+++ b/lib/sigpipe-die.h
@@ -41,25 +41,14 @@
 #ifndef _SIGPIPE_DIE_H
 #define _SIGPIPE_DIE_H
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 
-# ifndef __attribute__
-#  if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8)
-#   define __attribute__(x)
-#  endif
-# endif
-
-# ifndef ATTRIBUTE_NORETURN
-#  define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
-# endif
-
 /* Emit an error message indicating a SIGPIPE signal, and terminate the
    process with an error code.  */
-extern void sigpipe_die (void) 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.  */