svn commit: branches/uClibc-nptl/libc/stdio

[sjhill at uclibc.org]

Author: sjhill
Date: 2006-08-22 20:18:04 -0700 (Tue, 22 Aug 2006)
New Revision: 15909

Log:
Merge from trunk.


Modified:
   branches/uClibc-nptl/libc/stdio/__fsetlocking.c
   branches/uClibc-nptl/libc/stdio/_fpmaxtostr.c
   branches/uClibc-nptl/libc/stdio/_uintmaxtostr.c
   branches/uClibc-nptl/libc/stdio/_vfprintf.c
   branches/uClibc-nptl/libc/stdio/fflush.c
   branches/uClibc-nptl/libc/stdio/gets.c
   branches/uClibc-nptl/libc/stdio/perror.c
   branches/uClibc-nptl/libc/stdio/setbuffer.c
   branches/uClibc-nptl/libc/stdio/setlinebuf.c


Changeset:
Modified: branches/uClibc-nptl/libc/stdio/__fsetlocking.c
===================================================================
--- branches/uClibc-nptl/libc/stdio/__fsetlocking.c	2006-08-23 03:09:05 UTC (rev 15908)
+++ branches/uClibc-nptl/libc/stdio/__fsetlocking.c	2006-08-23 03:18:04 UTC (rev 15909)
@@ -9,9 +9,6 @@
 #include <stdio_ext.h>
 
 libc_hidden_proto(__fsetlocking)
-#ifdef __UCLIBC_HAS_THREADS__
-libc_hidden_proto(_stdio_user_locking)
-#endif
 
 /* Not threadsafe. */
 

Modified: branches/uClibc-nptl/libc/stdio/_fpmaxtostr.c
===================================================================
--- branches/uClibc-nptl/libc/stdio/_fpmaxtostr.c	2006-08-23 03:09:05 UTC (rev 15908)
+++ branches/uClibc-nptl/libc/stdio/_fpmaxtostr.c	2006-08-23 03:18:04 UTC (rev 15909)
@@ -12,9 +12,6 @@
 #include <bits/uClibc_fpmax.h>
 
 libc_hidden_proto(memset)
-#ifdef __UCLIBC_HAS_LOCALE__
-libc_hidden_proto(__global_locale)
-#endif
 
 typedef size_t (__fp_outfunc_t)(FILE *fp, intptr_t type, intptr_t len,
 								intptr_t buf);

Modified: branches/uClibc-nptl/libc/stdio/_uintmaxtostr.c
===================================================================
--- branches/uClibc-nptl/libc/stdio/_uintmaxtostr.c	2006-08-23 03:09:05 UTC (rev 15908)
+++ branches/uClibc-nptl/libc/stdio/_uintmaxtostr.c	2006-08-23 03:18:04 UTC (rev 15909)
@@ -12,9 +12,6 @@
 #include <bits/uClibc_uintmaxtostr.h>
 
 libc_hidden_proto(memcpy)
-#ifdef __UCLIBC_HAS_LOCALE__
-libc_hidden_proto(__global_locale)
-#endif
 
 /* Avoid using long long / and % operations to cut down dependencies on
  * libgcc.a.  Definitely helps on i386 at least. */

Modified: branches/uClibc-nptl/libc/stdio/_vfprintf.c
===================================================================
--- branches/uClibc-nptl/libc/stdio/_vfprintf.c	2006-08-23 03:09:05 UTC (rev 15908)
+++ branches/uClibc-nptl/libc/stdio/_vfprintf.c	2006-08-23 03:18:04 UTC (rev 15909)
@@ -512,10 +512,6 @@
 /**********************************************************************/
 #ifdef L__ppfs_init
 
-#ifdef __UCLIBC_HAS_LOCALE__
-libc_hidden_proto(__global_locale)
-#endif
-
 int attribute_hidden _ppfs_init(register ppfs_t *ppfs, const char *fmt0)
 {
 	int r;
@@ -736,7 +732,7 @@
 
 #ifdef __UCLIBC_HAS_XLOCALE__
 libc_hidden_proto(__ctype_b_loc)
-#else
+#elif __UCLIBC_HAS_CTYPE_TABLES__
 libc_hidden_proto(__ctype_b)
 #endif
 
@@ -1254,10 +1250,6 @@
 #define _outnwcs(stream, wstring, len)	_wstdio_fwrite(wstring, len, stream)
 #define FP_OUT _fp_out_wide
 
-#ifdef __UCLIBC_HAS_LOCALE__
-libc_hidden_proto(__global_locale)
-#endif
-
 static size_t _outnstr(FILE *stream, const char *s, size_t wclen)
 {
 	/* NOTE!!! len here is the number of wchars we want to generate!!! */

Modified: branches/uClibc-nptl/libc/stdio/fflush.c
===================================================================
--- branches/uClibc-nptl/libc/stdio/fflush.c	2006-08-23 03:09:05 UTC (rev 15908)
+++ branches/uClibc-nptl/libc/stdio/fflush.c	2006-08-23 03:18:04 UTC (rev 15909)
@@ -16,7 +16,6 @@
 #endif /* __UCLIBC_MJN3_ONLY__ */
 
 #ifdef __UCLIBC_HAS_THREADS__
-libc_hidden_proto(_stdio_user_locking)
 /* Even if the stream is set to user-locking, we still need to lock
  * when all (lbf) writing streams are flushed. */
 #define MY_STDIO_THREADLOCK(STREAM) \

Modified: branches/uClibc-nptl/libc/stdio/gets.c
===================================================================
--- branches/uClibc-nptl/libc/stdio/gets.c	2006-08-23 03:09:05 UTC (rev 15908)
+++ branches/uClibc-nptl/libc/stdio/gets.c	2006-08-23 03:18:04 UTC (rev 15909)
@@ -13,9 +13,7 @@
 
 libc_hidden_proto(getchar_unlocked)
 libc_hidden_proto(__fgetc_unlocked)
-#ifdef __STDIO_GETC_MACRO
-libc_hidden_proto(__stdin)
-#else
+#ifndef __STDIO_GETC_MACRO
 #define __stdin stdin
 #endif
 

Modified: branches/uClibc-nptl/libc/stdio/perror.c
===================================================================
--- branches/uClibc-nptl/libc/stdio/perror.c	2006-08-23 03:09:05 UTC (rev 15908)
+++ branches/uClibc-nptl/libc/stdio/perror.c	2006-08-23 03:18:04 UTC (rev 15909)
@@ -9,7 +9,6 @@
 
 libc_hidden_proto(fprintf)
 libc_hidden_proto(__glibc_strerror_r)
-libc_hidden_proto(stderr)
 
 #ifdef __UCLIBC_MJN3_ONLY__
 #warning CONSIDER: Increase buffer size for error message (non-%m case)?

Modified: branches/uClibc-nptl/libc/stdio/setbuffer.c
===================================================================
--- branches/uClibc-nptl/libc/stdio/setbuffer.c	2006-08-23 03:09:05 UTC (rev 15908)
+++ branches/uClibc-nptl/libc/stdio/setbuffer.c	2006-08-23 03:18:04 UTC (rev 15909)
@@ -7,6 +7,8 @@
 
 #include "_stdio.h"
 
+#ifdef __USE_BSD
+
 libc_hidden_proto(setvbuf)
 
 /* A BSD function.  The implementation matches the linux man page,
@@ -21,3 +23,4 @@
 	setvbuf(stream, buf, (buf ? _IOFBF : _IONBF), size);
 #endif
 }
+#endif

Modified: branches/uClibc-nptl/libc/stdio/setlinebuf.c
===================================================================
--- branches/uClibc-nptl/libc/stdio/setlinebuf.c	2006-08-23 03:09:05 UTC (rev 15908)
+++ branches/uClibc-nptl/libc/stdio/setlinebuf.c	2006-08-23 03:18:04 UTC (rev 15909)
@@ -7,6 +7,8 @@
 
 #include "_stdio.h"
 
+#ifdef __USE_BSD
+
 libc_hidden_proto(setvbuf)
 
 /* A BSD function.  The implementation matches the linux man page,
@@ -20,3 +22,4 @@
 	setvbuf(stream, NULL, _IOLBF, (size_t) 0);
 #endif
 }
+#endif