From d6e68295b4a0e6484fc52b7267d042bdd2c48906 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Fri, 3 Oct 2003 00:44:39 +0000 Subject: 2003-10-02 Roland McGrath * argp/argp-help.c (__argp_short_program_name): Move inside [! _LIBC]. * argp/argp-namefrob.h [_LIBC || HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME] (__argp_short_program_name): Don't declare fn, define it as a macro. --- argp/argp-namefrob.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'argp/argp-namefrob.h') diff --git a/argp/argp-namefrob.h b/argp/argp-namefrob.h index 395d9b6dd8..26e285bfba 100644 --- a/argp/argp-namefrob.h +++ b/argp/argp-namefrob.h @@ -1,5 +1,5 @@ /* Name frobnication for compiling argp outside of glibc - Copyright (C) 1997 Free Software Foundation, Inc. + Copyright (C) 1997, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader . @@ -138,10 +138,15 @@ # endif extern char *__argp_basename (char *name); -extern char *__argp_short_program_name (void); #endif /* !_LIBC */ #ifndef __set_errno #define __set_errno(e) (errno = (e)) #endif + +#if defined _LIBC || HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME +# define __argp_short_program_name() (program_invocation_short_name) +#else +extern char *__argp_short_program_name (void); +#endif -- cgit v1.2.3