Define a sometimes-link-required function using ARGMATCH_DIE_DECL.

* tests/test-argmatch.c (ARGMATCH_DIE_DECL): When defined,
use this macro to create a function _definition_.
Remove useless "#undef ARGMATCH_DIE".

diff --git a/ChangeLog b/ChangeLog
index ac7bd1116bad049dba9eb1c9d55497c34502ff83..9b3327839842bbce91dd2fd739c6387e2e9c8c67 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-14  Jim Meyering  <meyering@redhat.com>
+
+       Define a sometimes-link-required function using ARGMATCH_DIE_DECL.
+       * tests/test-argmatch.c (ARGMATCH_DIE_DECL): When defined,
+       use this macro to create a function _definition_.
+       Remove useless "#undef ARGMATCH_DIE".
+
 2007-11-14  Bruno Haible  <bruno@clisp.org>
 
        * lib/config.charset: Update for OpenBSD 4.1.

diff --git a/tests/test-argmatch.c b/tests/test-argmatch.c
index f6126f6bd95e499f56113ef2bc4b9fa0101a3293..363033fa691f26fb77b74dfdc8776ae7a472164c 100644 (file)
--- a/tests/test-argmatch.c
+++ b/tests/test-argmatch.c
@@ -19,10 +19,6 @@
 
 #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>
@@ -41,6 +37,12 @@
     }                                                                       \
   while (0)
 
+/* 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
+ARGMATCH_DIE_DECL { exit (1); }
+#endif
+
 enum backup_type
 {
   no_backups,