X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-argmatch.c;h=735cb767777a8ec5bb5c10fcd9bab491f2b28ff4;hb=1276a2c5f24c0c932426aca9c899fa524d2443f2;hp=c7f157fdb429abf4273ee0e1f49e2217897cf62f;hpb=441aa3044f43e5572f58c354f01e6bc070acd5c7;p=gnulib.git

diff --git a/tests/test-argmatch.c b/tests/test-argmatch.c
index c7f157fdb..735cb7677 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-2008 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1998-1999, 2001-2014 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
@@ -21,27 +21,18 @@
 
 #include "argmatch.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "progname.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* 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
+
+_Noreturn ARGMATCH_DIE_DECL;
 ARGMATCH_DIE_DECL { exit (1); }
+
 #endif
 
 enum backup_type