* 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.

diff --git a/ChangeLog b/ChangeLog
index dedba08a8de5e96032b28a7ffa95e78745d81fff..4cd64040d553a11b14c19df6f55a459cec53ec6d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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.
+
 2003-08-22  Simon Josefsson  <jas@extundo.com>
 
        * argp/argp-fmtstream.h [!__attribute__]: Define to nothing.