mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-21 01:12:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

2003-10-02 Roland McGrath <roland@redhat.com>

Browse Source 
* 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.
This commit is contained in:
Roland McGrath 2003-10-03 00:44:39 +00:00
parent f39941e412
commit d6e68295b4
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
argp/argp-help.c
View File

@ -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_*. */

9
argp/argp-namefrob.h
View File

@ -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