Avoid a gcc warning.

diff --git a/ChangeLog b/ChangeLog
index 970fd22..bf98685 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-10-25  Bruno Haible  <bruno@clisp.org>
 
+       * lib/progname.h (set_program_name): Undefine before defining.
+
+2006-10-25  Bruno Haible  <bruno@clisp.org>
+
        * lib/gettext.h (_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS): Define to
        false for non-gcc C++ compilers.
        Reported by Nelson H. F. Beebe <beebe@math.utah.edu>.

diff --git a/lib/progname.h b/lib/progname.h
index a5d9a04..206c2cc 100644 (file)
--- a/lib/progname.h
+++ b/lib/progname.h
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2001-2004 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
@@ -42,6 +42,7 @@ extern void set_program_name (const char *argv0);
 extern void set_program_name_and_installdir (const char *argv0,
                                             const char *orig_installprefix,
                                             const char *orig_installdir);
+#undef set_program_name
 #define set_program_name(ARG0) \
   set_program_name_and_installdir (ARG0, INSTALLPREFIX, INSTALLDIR)