exclude_tests: use _Noreturn

diff --git a/ChangeLog b/ChangeLog
index 2bbc93cfc8c6ccee61d4b26dd845b75ad6efa23c..5c7bc011cd04fa43de2a6c5fd5fdc8e3a64ffb44 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
 2011-07-12  Paul Eggert  <eggert@cs.ucla.edu>
 
-       argmatch-tests: use _Noreturn
-       * tests/test-argmatch.c (_GL_ATTRIBUTE_NORETURN): Remove.
+       argmatch-tests, exclude_tests: use _Noreturn
+       * tests/test-argmatch.c, tests/test-exclude.c (_GL_ATTRIBUTE_NORETURN):
+       Remove.
        (ARGMATCH_DIE_DECL): Use _Noreturn instead.
 
        stdlib: use _Noreturn

diff --git a/tests/test-exclude.c b/tests/test-exclude.c
index 8b1164a7d227a159c1757f7e772afb14881951dd..9c7997d971a6cd53b1ed73171af17be98c947e68 100644 (file)
--- a/tests/test-exclude.c
+++ b/tests/test-exclude.c
@@ -64,13 +64,7 @@ ARGMATCH_VERIFY (exclude_keywords, exclude_flags);
    thus must link with a definition of that function.  Provide it here.  */
 #ifdef ARGMATCH_DIE_DECL
 
-# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)
-#  define _GL_ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
-# else
-#  define _GL_ATTRIBUTE_NORETURN /* empty */
-# endif
-
-ARGMATCH_DIE_DECL _GL_ATTRIBUTE_NORETURN;
+_Noreturn ARGMATCH_DIE_DECL;
 ARGMATCH_DIE_DECL { exit (1); }
 
 #endif