# HG changeset patch # User Paul Eggert # Date 1356663386 28800 # Node ID 77788c0ee4f99f7086736f497944d177ddf17b3b # Parent 103c4c70c3d680c672aaf36094387e6d624ca143 argp: fix port of port new 'inline' approach to Sun C 5.12 + Solaris 10 The earlier patch forgot to update one of the #if conditions, causing a problem on Debian testing i386 reported by Mats Erik Andersson . * lib/argp-fmtstream.h (__argp_fmtstream_putc, argp_fmtstream_putc) (__argp_fmtstream_puts, argp_fmtstream_puts) (__argp_fmtstream_write, argp_fmtstream_write) [!_LIBC && !__OPTIMIZE__]: Declare as ARGP_FS_EI, not as extern. diff -r 103c4c70c3d6 -r 77788c0ee4f9 ChangeLog --- a/ChangeLog Thu Dec 27 17:39:58 2012 -0800 +++ b/ChangeLog Thu Dec 27 18:56:26 2012 -0800 @@ -1,5 +1,14 @@ 2012-12-27 Paul Eggert + argp: fix port of port new 'inline' approach to Sun C 5.12 + Solaris 10 + The earlier patch forgot to update one of the #if conditions, causing + a problem on Debian testing i386 reported by Mats Erik Andersson + . + * lib/argp-fmtstream.h (__argp_fmtstream_putc, argp_fmtstream_putc) + (__argp_fmtstream_puts, argp_fmtstream_puts) + (__argp_fmtstream_write, argp_fmtstream_write) + [!_LIBC && !__OPTIMIZE__]: Declare as ARGP_FS_EI, not as extern. + * doc/gnulib-readme.texi: Minor fixups. (Portability guidelines): Modernize URLs. Remove some repetition. (Indent with spaces not TABs): Reword to avoid too-long lines. diff -r 103c4c70c3d6 -r 77788c0ee4f9 lib/argp-fmtstream.h --- a/lib/argp-fmtstream.h Thu Dec 27 17:39:58 2012 -0800 +++ b/lib/argp-fmtstream.h Thu Dec 27 18:56:26 2012 -0800 @@ -133,7 +133,7 @@ const char *__fmt, ...) _GL_ATTRIBUTE_FORMAT ((printf, 2, 3)); -#if _LIBC || !defined __OPTIMIZE__ +#if _LIBC extern int __argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch); extern int argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);