X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-argmatch.c;h=9e24dc19f97486aeae3a55102e8cf6c8206f996d;hb=8041b27617211a5762e58670b0acf474ffcfa610;hp=bf4a22f92249c968f0fd0b3ae5e6c0d95be0af4d;hpb=d4ee8943cf24b460e938e903c0bfaaaf25706fe9;p=gnulib.git

diff --git a/tests/test-argmatch.c b/tests/test-argmatch.c
index bf4a22f92..9e24dc19f 100644
--- a/tests/test-argmatch.c
+++ b/tests/test-argmatch.c
@@ -1,5 +1,5 @@
 /* Test of exact or abbreviated match search.
-   Copyright (C) 1990, 1998-1999, 2001-2010 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1998-1999, 2001-2013 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -29,18 +29,10 @@
 /* Some packages define ARGMATCH_DIE and ARGMATCH_DIE_DECL in <config.h>, and
    thus must link with a definition of that function.  Provide it here.  */
 #ifdef ARGMATCH_DIE_DECL
-#ifndef __attribute__
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8)
-#  define __attribute__(x) /* empty */
-# endif
-#endif
-
-#ifndef ATTRIBUTE_NORETURN
-# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
-#endif
 
-ARGMATCH_DIE_DECL ATTRIBUTE_NORETURN;
+_Noreturn ARGMATCH_DIE_DECL;
 ARGMATCH_DIE_DECL { exit (1); }
+
 #endif
 
 enum backup_type