From 2f34c96410ed6ec496cd128d03e3a0026c20d104 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 27 Dec 2012 18:56:26 -0800 Subject: [PATCH] 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. --- ChangeLog | 9 +++++++++ lib/argp-fmtstream.h | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b3fdd2b81b..41e35e3ade 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 --git a/lib/argp-fmtstream.h b/lib/argp-fmtstream.h index 8247fc231d..91fbea4040 100644 --- a/lib/argp-fmtstream.h +++ b/lib/argp-fmtstream.h @@ -133,7 +133,7 @@ extern ssize_t argp_fmtstream_printf (argp_fmtstream_t __fs, 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); -- 2.39.5