Fix a few bugs in the new extended locale functions.

[uclinux-h8/uClibc.git] / include / wchar.h

diff --git a/include/wchar.h b/include/wchar.h
index 5fb44f4..09ab741 100644 (file)
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -180,9 +180,13 @@ extern int wcsncasecmp (__const wchar_t *__s1, __const wchar_t *__s2,
 
 extern int wcscasecmp_l (__const wchar_t *__s1, __const wchar_t *__s2,
                         __locale_t __loc) __THROW;
+extern int __wcscasecmp_l (__const wchar_t *__s1, __const wchar_t *__s2,
+                        __locale_t __loc) __THROW;
 
 extern int wcsncasecmp_l (__const wchar_t *__s1, __const wchar_t *__s2,
                          size_t __n, __locale_t __loc) __THROW;
+extern int __wcsncasecmp_l (__const wchar_t *__s1, __const wchar_t *__s2,
+                         size_t __n, __locale_t __loc) __THROW;
 #endif /* __UCLIBC_HAS_XLOCALE__ */
 #endif
 
@@ -206,12 +210,17 @@ __END_NAMESPACE_C99
    LC_COLLATE category of the given locale.  */
 extern int wcscoll_l (__const wchar_t *__s1, __const wchar_t *__s2,
                      __locale_t __loc) __THROW;
+extern int __wcscoll_l (__const wchar_t *__s1, __const wchar_t *__s2,
+                     __locale_t __loc) __THROW;
 
 /* Transform S2 into array pointed to by S1 such that if wcscmp is
    applied to two transformed strings the result is the as applying
    `wcscoll' to the original strings.  */
 extern size_t wcsxfrm_l (wchar_t *__s1, __const wchar_t *__s2,
                         size_t __n, __locale_t __loc) __THROW;
+extern size_t __wcsxfrm_l (wchar_t *__s1, __const wchar_t *__s2,
+                        size_t __n, __locale_t __loc) __THROW;
+
 #endif /* __UCLIBC_HAS_XLOCALE__ */
 
 /* Duplicate S, returning an identical malloc'd string.  */
@@ -465,33 +474,57 @@ extern unsigned long long int wcstouq (__const wchar_t *__restrict __nptr,
 extern long int wcstol_l (__const wchar_t *__restrict __nptr,
                          wchar_t **__restrict __endptr, int __base,
                          __locale_t __loc) __THROW;
+extern long int __wcstol_l (__const wchar_t *__restrict __nptr,
+                         wchar_t **__restrict __endptr, int __base,
+                         __locale_t __loc) __THROW;
 
 extern unsigned long int wcstoul_l (__const wchar_t *__restrict __nptr,
                                    wchar_t **__restrict __endptr,
                                    int __base, __locale_t __loc) __THROW;
+extern unsigned long int __wcstoul_l (__const wchar_t *__restrict __nptr,
+                                   wchar_t **__restrict __endptr,
+                                   int __base, __locale_t __loc) __THROW;
 
 __extension__
 extern long long int wcstoll_l (__const wchar_t *__restrict __nptr,
                                wchar_t **__restrict __endptr,
                                int __base, __locale_t __loc) __THROW;
+__extension__
+extern long long int __wcstoll_l (__const wchar_t *__restrict __nptr,
+                               wchar_t **__restrict __endptr,
+                               int __base, __locale_t __loc) __THROW;
 
 __extension__
 extern unsigned long long int wcstoull_l (__const wchar_t *__restrict __nptr,
                                          wchar_t **__restrict __endptr,
                                          int __base, __locale_t __loc)
      __THROW;
+__extension__
+extern unsigned long long int __wcstoull_l (__const wchar_t *__restrict __nptr,
+                                         wchar_t **__restrict __endptr,
+                                         int __base, __locale_t __loc)
+     __THROW;
 
 extern double wcstod_l (__const wchar_t *__restrict __nptr,
                        wchar_t **__restrict __endptr, __locale_t __loc)
      __THROW;
+extern double __wcstod_l (__const wchar_t *__restrict __nptr,
+                       wchar_t **__restrict __endptr, __locale_t __loc)
+     __THROW;
 
 extern float wcstof_l (__const wchar_t *__restrict __nptr,
                       wchar_t **__restrict __endptr, __locale_t __loc)
      __THROW;
+extern float __wcstof_l (__const wchar_t *__restrict __nptr,
+                      wchar_t **__restrict __endptr, __locale_t __loc)
+     __THROW;
 
 extern long double wcstold_l (__const wchar_t *__restrict __nptr,
                              wchar_t **__restrict __endptr,
                              __locale_t __loc) __THROW;
+extern long double __wcstold_l (__const wchar_t *__restrict __nptr,
+                             wchar_t **__restrict __endptr,
+                             __locale_t __loc) __THROW;
 #endif /* __UCLIBC_HAS_XLOCALE__ */
 #endif /* GNU */
 
@@ -803,6 +836,7 @@ extern int fputws_unlocked (__const wchar_t *__restrict __ws,
 #endif
 
 
+#if 0
 __BEGIN_NAMESPACE_C99
 /* Format TP into S according to FORMAT.
    Write no more than MAXSIZE wide characters and return the number
@@ -822,8 +856,13 @@ extern size_t wcsftime_l (wchar_t *__restrict __s, size_t __maxsize,
                          __const wchar_t *__restrict __format,
                          __const struct tm *__restrict __tp,
                          __locale_t __loc) __THROW;
+extern size_t __wcsftime_l (wchar_t *__restrict __s, size_t __maxsize,
+                         __const wchar_t *__restrict __format,
+                         __const struct tm *__restrict __tp,
+                         __locale_t __loc) __THROW;
 #endif /* __UCLIBC_HAS_XLOCALE__ */
 # endif
+#endif /* 0 */
 
 /* The X/Open standard demands that most of the functions defined in
    the <wctype.h> header must also appear here.  This is probably