# HG changeset patch # User Paul Eggert # Date 1310457820 25200 # Node ID 7d9ccb4802204aa7dc788f2b9899dd27640b1d51 # Parent d4809f2a119d1233298aeb95fa04f91d4903b7db argmatch-tests: use _Noreturn * tests/test-argmatch.c (_GL_ATTRIBUTE_NORETURN): Remove. (ARGMATCH_DIE_DECL): Use _Noreturn instead. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-07-12 Paul Eggert + 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 --- 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