[Commits] r15586 - in /trunk/libc: ChangeLog.eglibc argp/argp-fmtstream.c argp/argp-help.c

[joseph@xxxxxxxxxx]

Author: joseph
Date: Wed Oct 26 18:45:28 2011
New Revision: 15586

Log:
	* argp/argp-fmtstream.c, argp/argp-help.c: Condition uses of
	libc-internal interfaces on _LIBC.

Modified:
    trunk/libc/ChangeLog.eglibc
    trunk/libc/argp/argp-fmtstream.c
    trunk/libc/argp/argp-help.c

Modified: trunk/libc/ChangeLog.eglibc
==============================================================================
--- trunk/libc/ChangeLog.eglibc (original)
+++ trunk/libc/ChangeLog.eglibc Wed Oct 26 18:45:28 2011
@@ -1,3 +1,8 @@
+2011-10-26  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* argp/argp-fmtstream.c, argp/argp-help.c: Condition uses of
+	libc-internal interfaces on _LIBC.
+
 2011-10-25  Michael Hope  <michael.hope@xxxxxxxxxx>
 
 	* aclocal.m4 (PKGVERSION_TEXI): Define.

Modified: trunk/libc/argp/argp-fmtstream.c
==============================================================================
--- trunk/libc/argp/argp-fmtstream.c (original)
+++ trunk/libc/argp/argp-fmtstream.c Wed Oct 26 18:45:28 2011
@@ -102,7 +102,11 @@
   __argp_fmtstream_update (fs);
   if (fs->p > fs->buf)
     {
+#ifdef _LIBC
       __fxprintf (fs->stream, "%.*s", (int) (fs->p - fs->buf), fs->buf);
+#else
+      fwrite_unlocked (fs->buf, 1, fs->p - fs->buf, fs->stream);
+#endif
     }
   free (fs->buf);
   free (fs);
@@ -147,6 +151,7 @@
 	      size_t i;
 	      for (i = 0; i < pad; i++)
 		{
+#ifdef _LIBC
 		  if (_IO_fwide (fs->stream, 0) > 0)
                     {
 #if ! _LIBC || __OPTION_POSIX_WIDE_CHAR_DEVICE_IO
@@ -156,6 +161,7 @@
 #endif
                     }
 		  else
+#endif
 		    putc_unlocked (' ', fs->stream);
 		}
 	    }
@@ -316,6 +322,7 @@
 	      *nl++ = ' ';
 	  else
 	    for (i = 0; i < fs->wmargin; ++i)
+#ifdef _LIBC
 	      if (_IO_fwide (fs->stream, 0) > 0)
                 {
 #ifdef OPTION_POSIX_WIDE_CHAR_DEVICE_IO
@@ -325,6 +332,7 @@
 #endif
                 }
 	      else
+#endif
 		putc_unlocked (' ', fs->stream);
 
 	  /* Copy the tail of the original buffer into the current buffer

Modified: trunk/libc/argp/argp-help.c
==============================================================================
--- trunk/libc/argp/argp-help.c (original)
+++ trunk/libc/argp/argp-help.c Wed Oct 26 18:45:28 2011
@@ -1874,6 +1874,7 @@
 #endif
 	    }
 
+#ifdef _LIBC
 	  if (_IO_fwide (stream, 0) > 0)
             {
 #if ! _LIBC || __OPTION_POSIX_WIDE_CHAR_DEVICE_IO
@@ -1883,6 +1884,7 @@
 #endif
             }
 	  else
+#endif
 	    putc_unlocked ('\n', stream);
 
 #if _LIBC || (HAVE_FLOCKFILE && HAVE_FUNLOCKFILE)

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits