svn commit: trunk/uClibc/libc: misc/regex misc/wchar stdio string
psm at uclibc.org
psm at uclibc.org
Sun Nov 27 01:21:07 UTC 2005
Author: psm
Date: 2005-11-26 17:20:58 -0800 (Sat, 26 Nov 2005)
New Revision: 12542
Log:
Hide some wcs*
Modified:
trunk/uClibc/libc/misc/regex/regex.c
trunk/uClibc/libc/misc/wchar/wstdio.c
trunk/uClibc/libc/stdio/fputws.c
trunk/uClibc/libc/stdio/scanf.c
trunk/uClibc/libc/stdio/vfprintf.c
trunk/uClibc/libc/string/wcsdup.c
trunk/uClibc/libc/string/wcstok.c
trunk/uClibc/libc/string/wstring.c
Changeset:
Modified: trunk/uClibc/libc/misc/regex/regex.c
===================================================================
--- trunk/uClibc/libc/misc/regex/regex.c 2005-11-27 00:24:52 UTC (rev 12541)
+++ trunk/uClibc/libc/misc/regex/regex.c 2005-11-27 01:20:58 UTC (rev 12542)
@@ -26,6 +26,7 @@
#define memcmp __memcmp
#define strcmp __strcmp
#define strlen __strlen
+#define wcslen __wcslen
/* for some reason this does not work */
#define memcpy __memcpy
Modified: trunk/uClibc/libc/misc/wchar/wstdio.c
===================================================================
--- trunk/uClibc/libc/misc/wchar/wstdio.c 2005-11-27 00:24:52 UTC (rev 12541)
+++ trunk/uClibc/libc/misc/wchar/wstdio.c 2005-11-27 01:20:58 UTC (rev 12542)
@@ -49,6 +49,7 @@
* Should auto_wr_transition init the mbstate object?
*/
+#define wcslen __wcslen
#define _GNU_SOURCE
#include <stdio.h>
Modified: trunk/uClibc/libc/stdio/fputws.c
===================================================================
--- trunk/uClibc/libc/stdio/fputws.c 2005-11-27 00:24:52 UTC (rev 12541)
+++ trunk/uClibc/libc/stdio/fputws.c 2005-11-27 01:20:58 UTC (rev 12542)
@@ -5,6 +5,8 @@
* Dedicated to Toni. See uClibc/DEDICATION.mjn3 for details.
*/
+#define wcslen __wcslen
+
#include "_stdio.h"
extern int __fputws_unlocked(const wchar_t *__restrict ws,
Modified: trunk/uClibc/libc/stdio/scanf.c
===================================================================
--- trunk/uClibc/libc/stdio/scanf.c 2005-11-27 00:24:52 UTC (rev 12541)
+++ trunk/uClibc/libc/stdio/scanf.c 2005-11-27 01:20:58 UTC (rev 12542)
@@ -43,6 +43,7 @@
* standards and from an official C standard defect report.
*/
+#define wcslen __wcslen
#define _ISOC99_SOURCE /* for LLONG_MAX primarily... */
#define _GNU_SOURCE
Modified: trunk/uClibc/libc/stdio/vfprintf.c
===================================================================
--- trunk/uClibc/libc/stdio/vfprintf.c 2005-11-27 00:24:52 UTC (rev 12541)
+++ trunk/uClibc/libc/stdio/vfprintf.c 2005-11-27 01:20:58 UTC (rev 12542)
@@ -90,6 +90,8 @@
#define _uintmaxtostr __libc__uintmaxtostr
#define strnlen __strnlen
+#define wcslen __wcslen
+#define wcsnlen __wcsnlen
#define _ISOC99_SOURCE /* for ULLONG primarily... */
#define _GNU_SOURCE
Modified: trunk/uClibc/libc/string/wcsdup.c
===================================================================
--- trunk/uClibc/libc/string/wcsdup.c 2005-11-27 00:24:52 UTC (rev 12541)
+++ trunk/uClibc/libc/string/wcsdup.c 2005-11-27 01:20:58 UTC (rev 12542)
@@ -10,8 +10,8 @@
#undef Wstrlen
#undef Wstrcpy
-#define Wstrlen wcslen
-#define Wstrcpy wcscpy
+#define Wstrlen __wcslen
+#define Wstrcpy __wcscpy
#include "wstring.c"
Modified: trunk/uClibc/libc/string/wcstok.c
===================================================================
--- trunk/uClibc/libc/string/wcstok.c 2005-11-27 00:24:52 UTC (rev 12541)
+++ trunk/uClibc/libc/string/wcstok.c 2005-11-27 01:20:58 UTC (rev 12542)
@@ -9,9 +9,9 @@
#define Wstrtok_r __wcstok
#undef Wstrspn
-#define Wstrspn wcsspn
+#define Wstrspn __wcsspn
#undef Wstrpbrk
-#define Wstrpbrk wcspbrk
+#define Wstrpbrk __wcspbrk
#include "wstring.c"
Modified: trunk/uClibc/libc/string/wstring.c
===================================================================
--- trunk/uClibc/libc/string/wstring.c 2005-11-27 00:24:52 UTC (rev 12541)
+++ trunk/uClibc/libc/string/wstring.c 2005-11-27 01:20:58 UTC (rev 12542)
@@ -72,6 +72,12 @@
extern char *__strpbrk (__const char *__s, __const char *__accept) attribute_hidden;
extern size_t __strspn (__const char *__s, __const char *__accept) attribute_hidden;
extern char *__strsignal (int __sig) attribute_hidden;
+extern wchar_t *__wcsdup (__const wchar_t *__s) attribute_hidden;
+extern size_t __wcslen (__const wchar_t *__s) attribute_hidden;
+extern wchar_t *__wcscpy (wchar_t *__restrict __dest,
+ __const wchar_t *__restrict __src) attribute_hidden;
+extern size_t __wcsspn (__const wchar_t *__wcs, __const wchar_t *__accept) attribute_hidden;
+extern wchar_t *__wcspbrk (__const wchar_t *__wcs, __const wchar_t *__accept) attribute_hidden;
/**********************************************************************/
/* NOTE: If we ever do internationalized syserr messages, this will
More information about the uClibc-cvs
mailing list