Re: Multiple argp_fmtstream_puts, etcetera.

[Paul Eggert]

On 12/27/2012 02:47 PM, Mats Erik Andersson wrote:

> the recent change to "lib/argp-fmtstream.h" is breaking the possibility
> of building GNU inetutils on an i386 system running Debian testing.
> The cause is multiple definitions of argp_fmtstream_*, as can be
> inferred from the error text reproduced below.

Thanks for reporting that.  I pushed the following, which should fix it:

-----
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.
diff --git a/lib/argp-fmtstream.h b/lib/argp-fmtstream.h
index 8247fc2..91fbea4 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);