diff options
| author | Roland McGrath <roland@gnu.org> | 2003-10-03 00:44:39 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2003-10-03 00:44:39 +0000 |
| commit | d6e68295b4a0e6484fc52b7267d042bdd2c48906 (patch) | |
| tree | 171b9b44fc733a0c1cc9f17caff0649a77014e92 /argp | |
| parent | f39941e4127085f2120e40ffefc287f8c4a9548a (diff) | |
| download | glibc-d6e68295b4a0e6484fc52b7267d042bdd2c48906.zip glibc-d6e68295b4a0e6484fc52b7267d042bdd2c48906.tar.gz glibc-d6e68295b4a0e6484fc52b7267d042bdd2c48906.tar.bz2 | |
2003-10-02 Roland McGrath <roland@redhat.com>
* 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.
Diffstat (limited to 'argp')
| -rw-r--r-- | argp/argp-help.c | 18 | ||||
| -rw-r--r-- | argp/argp-namefrob.h | 9 |
2 files changed, 16 insertions, 11 deletions
diff --git a/argp/argp-help.c b/argp/argp-help.c index f39ce2a..1365abc 100644 --- a/argp/argp-help.c +++ b/argp/argp-help.c @@ -87,7 +87,7 @@ char *strerror (int errnum); #ifndef SIZE_MAX # define SIZE_MAX ((size_t) -1) -#endif +#endif /* User-selectable (using an environment variable) formatting parameters. @@ -1696,25 +1696,25 @@ char *__argp_basename (char *name) char *short_name = strrchr (name, '/'); return short_name ? short_name + 1 : name; } -#endif char * __argp_short_program_name (void) { -#if defined _LIBC || HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME +# if HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME return program_invocation_short_name; -#elif HAVE_DECL_PROGRAM_INVOCATION_NAME +# elif HAVE_DECL_PROGRAM_INVOCATION_NAME return __argp_basename (program_invocation_name); -#else +# else /* FIXME: What now? Miles suggests that it is better to use NULL, but currently the value is passed on directly to fputs_unlocked, so that requires more changes. */ -#if __GNUC__ -# warning No reasonable value to return -#endif /* __GNUC__ */ +# if __GNUC__ +# warning No reasonable value to return +# endif /* __GNUC__ */ return ""; -#endif +# endif } +#endif /* Output, if appropriate, a usage message for STATE to STREAM. FLAGS are from the set ARGP_HELP_*. */ diff --git a/argp/argp-namefrob.h b/argp/argp-namefrob.h index 395d9b6..26e285b 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 <miles@gnu.ai.mit.edu>. @@ -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 |