A better way to avoid link failure for the argmatch test.

diff --git a/ChangeLog b/ChangeLog
index ef5eb8fbcfa390f76583152cbfecc01d8c679c49..a6a3f1f69cdbad46395b8ec89a9aac7fd18ed348 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-11  Bruno Haible  <bruno@clisp.org>
+
+       * tests/test-argmatch.c (ARGMATCH_DIE): Undefine.
+       (usage): Remove function.
+
 2007-11-11  Bruno Haible  <bruno@clisp.org>
 
        * m4/roundf.m4 (gl_FUNC_ROUNDF): Use gl_FUNC_FLOORF_LIBS and

diff --git a/tests/test-argmatch.c b/tests/test-argmatch.c
index 3d6f968cf8f12203b7259fea1a2fa1300dffc7d1..f6126f6bd95e499f56113ef2bc4b9fa0101a3293 100644 (file)
--- a/tests/test-argmatch.c
+++ b/tests/test-argmatch.c
@@ -19,6 +19,10 @@
 
 #include <config.h>
 
+/* Some packages define ARGMATCH_DIE in their <config.h>.  Here we want to
+   assume the default definition of ARGMATCH_DIE.  */
+#undef ARGMATCH_DIE
+
 #include "argmatch.h"
 
 #include <stdio.h>
@@ -62,11 +66,6 @@ static const enum backup_type backup_vals[] =
   numbered_backups, numbered_backups, numbered_backups
 };
 
-void
-usage (void)
-{
-}
-
 int
 main (int argc, char *argv[])
 {