svn commit: trunk/uClibc/libc/stdio

psm at uclibc.org psm at uclibc.org
Fri Dec 9 16:42:15 UTC 2005


Author: psm
Date: 2005-12-09 08:41:59 -0800 (Fri, 09 Dec 2005)
New Revision: 12781

Log:
Guard wchar dependent stuff properly, thx vapier

Modified:
   trunk/uClibc/libc/stdio/_stdio.h


Changeset:
Modified: trunk/uClibc/libc/stdio/_stdio.h
===================================================================
--- trunk/uClibc/libc/stdio/_stdio.h	2005-12-09 15:43:30 UTC (rev 12780)
+++ trunk/uClibc/libc/stdio/_stdio.h	2005-12-09 16:41:59 UTC (rev 12781)
@@ -26,10 +26,6 @@
 		      __const char *__restrict __format, __gnuc_va_list __arg)
      __THROW __attribute__ ((__format__ (__printf__, 3, 0))) attribute_hidden;
 
-extern int __vfwprintf (__FILE *__restrict __s,
-		      __const wchar_t *__restrict __format,
-		      __gnuc_va_list __arg) attribute_hidden;
-
 extern int __vfscanf (FILE *__restrict __s, __const char *__restrict __format,
 		    __gnuc_va_list __arg)
      __attribute__ ((__format__ (__scanf__, 2, 0))) attribute_hidden;
@@ -38,15 +34,19 @@
 		    __const char *__restrict __format, __gnuc_va_list __arg)
      __THROW __attribute__ ((__format__ (__scanf__, 2, 0))) attribute_hidden;
 
+#ifdef __UCLIBC_HAS_WCHAR__
+#include <wchar.h>
+
+extern int __vfwprintf (__FILE *__restrict __s,
+		      __const wchar_t *__restrict __format,
+		      __gnuc_va_list __arg) attribute_hidden;
+
 extern int __vfwscanf (__FILE *__restrict __s,
 		     __const wchar_t *__restrict __format,
 		     __gnuc_va_list __arg) attribute_hidden;
 extern int __vswscanf (__const wchar_t *__restrict __s,
 		     __const wchar_t *__restrict __format,
 		     __gnuc_va_list __arg) __THROW attribute_hidden;
-
-#ifdef __UCLIBC_HAS_WCHAR__
-#include <wchar.h>
 #endif
 
 #ifdef __UCLIBC_HAS_THREADS__




More information about the uClibc-cvs mailing list