openat: use stdnoreturn.h

* lib/openat.h: Include <stdnoreturn.h>.
(_GL_ATTRIBUTE_NORETURN): Remove; all uses replaced with noreturn.
* modules/openat (Depends-on): Add stdnoreturn.

diff --git a/ChangeLog b/ChangeLog
index 1ad494fd391a52bca9607635963c19883047ff13..40c5990139e21a53b1e69991806339f69edb6bf3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-07-12  Paul Eggert  <eggert@cs.ucla.edu>
 
+       openat: use stdnoreturn.h
+       * lib/openat.h: Include <stdnoreturn.h>.
+       (_GL_ATTRIBUTE_NORETURN): Remove; all uses replaced with noreturn.
+       * modules/openat (Depends-on): Add stdnoreturn.
+
        * lib/openat-die.c (openat_save_fail): Modernize comment.
 
        * lib/xalloc-die.c (xalloc_die): Modernize comment.

diff --git a/lib/openat.h b/lib/openat.h
index 5cb186652f6d85381a9eb0317c686ec7dfa8ed1c..d1e74331f16a03d9ec6ffbfd0baf46462342b927 100644 (file)
--- a/lib/openat.h
+++ b/lib/openat.h
@@ -26,12 +26,7 @@
 #include <dirent.h>
 #include <unistd.h>
 #include <stdbool.h>
-
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)
-# define _GL_ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
-#else
-# define _GL_ATTRIBUTE_NORETURN /* empty */
-#endif
+#include <stdnoreturn.h>
 
 #if !HAVE_OPENAT
 
@@ -47,8 +42,8 @@ bool openat_needs_fchdir (void);
 
 #endif
 
-void openat_restore_fail (int) _GL_ATTRIBUTE_NORETURN;
-void openat_save_fail (int) _GL_ATTRIBUTE_NORETURN;
+noreturn void openat_restore_fail (int);
+noreturn void openat_save_fail (int);
 
 /* Using these function names makes application code
    slightly more readable than it would be with

diff --git a/modules/openat b/modules/openat
index b9ce4d46ab1accd47e82b911f74374917a314e77..06a4c75aa0b599ab776939c4221272bd56158501 100644 (file)
--- a/modules/openat
+++ b/modules/openat
@@ -32,6 +32,7 @@ openat-die
 rmdir           [test $REPLACE_UNLINKAT = 1]
 save-cwd
 stdbool
+stdnoreturn
 sys_stat
 unistd
 unlink          [test $REPLACE_UNLINKAT = 1]