X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fprogname.c;h=df52f609216d12ddc68a236e1176abd3771af6e7;hb=0191a7041eba6c7f9190e56dea2430ded092fc68;hp=2a497631596cb2ab91ea0ef66f006860bc53d4c8;hpb=ea1d8c004c8d70b20a1ee910f75abb5a68ace9e0;p=gnulib.git

diff --git a/lib/progname.c b/lib/progname.c
index 2a4976315..df52f6092 100644
--- a/lib/progname.c
+++ b/lib/progname.c
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2001-2003 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-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
@@ -14,25 +14,21 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 /* Specification.  */
+#undef ENABLE_RELOCATABLE /* avoid defining set_program_name as a macro */
 #include "progname.h"
 
-#include <stdio.h>
 #include <string.h>
 
-#undef set_program_name
-
 
 /* String containing name the program is called with.
    To be initialized by main().  */
-const char *program_name;
+const char *program_name = NULL;
 
 /* Set program_name, based on argv[0].  */
 void