Mercurial > gnulib
changeset 17226:77788c0ee4f9
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
<http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00124.html>.
* 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.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Thu, 27 Dec 2012 18:56:26 -0800 |
| parents | 103c4c70c3d6 |
| children | 67103803e184 |
| files | ChangeLog lib/argp-fmtstream.h |
| diffstat | 2 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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 <eggert@cs.ucla.edu> + 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 + <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00124.html>. + * 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.
--- 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);