X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fargp-namefrob.h;h=ea3086455ed945650b68d25763b218af0b042858;hb=fdba88ca5c48680a219e742f0b3d480daf74703d;hp=d7b991518d407cb607affe6a0f9bd8f51fd1493e;hpb=9fe27f56824380dad39d73f1378641a830ae1aa0;p=gnulib.git

diff --git a/lib/argp-namefrob.h b/lib/argp-namefrob.h
index d7b991518..ea3086455 100644
--- a/lib/argp-namefrob.h
+++ b/lib/argp-namefrob.h
@@ -141,6 +141,20 @@
 # define putchar_unlocked(x) putchar (x)
 # endif
 
+/* GNULIB makes sure both program_invocation_name and
+   program_invocation_short_name are available */
+#ifdef GNULIB_PROGRAM_INVOCATION_NAME
+extern char *program_invocation_name;
+# undef HAVE_DECL_PROGRAM_INVOCATION_NAME
+# define HAVE_DECL_PROGRAM_INVOCATION_NAME 1
+#endif
+
+#ifdef GNULIB_PROGRAM_INVOCATION_SHORT_NAME
+extern char *program_invocation_short_name;
+# undef HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME
+# define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME 1
+#endif
+
 #endif /* !_LIBC */
 
 #ifndef __set_errno
@@ -150,7 +164,7 @@
 #if defined GNULIB_ARGP_DISABLE_DIRNAME
 # define __argp_base_name(arg) arg
 #elif defined GNULIB_ARGP_EXTERN_BASENAME
-# extern char *__argp_base_name(const char *arg);
+extern char *__argp_base_name(const char *arg);
 #else
 # include "dirname.h"
 # define __argp_base_name base_name