Move declarations of program_invocation_name and program_invocation_short_name to...

diff --git a/lib/argp-namefrob.h b/lib/argp-namefrob.h
index ea3086455ed945650b68d25763b218af0b042858..f10f58297bb43686e8d0f9e50877e287932cb55f 100644 (file)
--- a/lib/argp-namefrob.h
+++ b/lib/argp-namefrob.h
@@ -141,20 +141,6 @@
 # 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

diff --git a/lib/argp.h b/lib/argp.h
index 8cb8c72384e2dd5624010f6d7c8c77a402748afe..f22a56be3e9ae7211f7e746a1bd64249427e3a9a 100644 (file)
--- a/lib/argp.h
+++ b/lib/argp.h
@@ -423,6 +423,20 @@ extern error_t __argp_parse (const struct argp *__restrict __argp,
 \f
 /* Global variables.  */
 
+/* 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
+
 /* If defined or set by the user program to a non-zero value, then a default
    option --version is added (unless the ARGP_NO_HELP flag is used), which
    will print this string followed by a newline and exit (unless the