argmatch-tests: use _Noreturn

* tests/test-argmatch.c (_GL_ATTRIBUTE_NORETURN): Remove.
(ARGMATCH_DIE_DECL): Use _Noreturn instead.

diff --git a/ChangeLog b/ChangeLog
index 56ad1ddf90bd9c90de8e565a0cd32cfc08173fc0..2bbc93cfc8c6ccee61d4b26dd845b75ad6efa23c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-07-12  Paul Eggert  <eggert@cs.ucla.edu>
 
+       argmatch-tests: use _Noreturn
+       * tests/test-argmatch.c (_GL_ATTRIBUTE_NORETURN): Remove.
+       (ARGMATCH_DIE_DECL): Use _Noreturn instead.
+
        stdlib: use _Noreturn
        * lib/stdlib.in.h (_GL_ATTRIBUTE_NORETURN): Remove.
        (_Exit): Use _Noreturn rather than _GL_ATTRIBUTE_NORETURN.

diff --git a/tests/test-argmatch.c b/tests/test-argmatch.c
index fa25a7c0ad32d125bfbe64f848a0b7b2cb950a9a..ae1ad510d618fb224dbeedf35fce841da67bc949 100644 (file)
--- a/tests/test-argmatch.c
+++ b/tests/test-argmatch.c
@@ -30,13 +30,7 @@
    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