From 48fa93438be3a713e6d3f9b8d227b0431c07bf63 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 12 Jul 2011 01:03:40 -0700 Subject: [PATCH] argmatch-tests: use _Noreturn * tests/test-argmatch.c (_GL_ATTRIBUTE_NORETURN): Remove. (ARGMATCH_DIE_DECL): Use _Noreturn instead. --- ChangeLog | 4 ++++ tests/test-argmatch.c | 8 +------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 56ad1ddf9..2bbc93cfc 100644 --- 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 index fa25a7c0a..ae1ad510d 100644 --- 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 -- 2.11.0