summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2005-12-06 14:26:43 +0000
committerPeter S. Mazinger <ps.m@gmx.net>2005-12-06 14:26:43 +0000
commit0a8209d901e1c91f9f6fd130c3fa6919fc44780d (patch)
tree38f97028288d4bcf8e219ae9005202b11c999936
parentdb782340c479b741bb7e05478342c9800f06e90f (diff)
Sync to glibc, remove __x
-rw-r--r--include/wchar.h36
-rw-r--r--include/wctype.h18
2 files changed, 0 insertions, 54 deletions
diff --git a/include/wchar.h b/include/wchar.h
index ed83ccc4a..bd6447b96 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -180,13 +180,9 @@ 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
@@ -210,16 +206,12 @@ __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__ */
@@ -466,58 +458,34 @@ 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;
#ifdef __UCLIBC_HAS_FLOATS__
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_FLOATS__ */
#endif /* __UCLIBC_HAS_XLOCALE__ */
#endif /* GNU */
@@ -763,10 +731,6 @@ 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
diff --git a/include/wctype.h b/include/wctype.h
index 688c1fd46..266ffab38 100644
--- a/include/wctype.h
+++ b/include/wctype.h
@@ -48,7 +48,6 @@ typedef unsigned int wint_t;
# ifdef __USE_ISOC99
__USING_NAMESPACE_C99(wint_t)
# endif
-__END_NAMESPACE_C99
# endif
/* Constant expression of type `wint_t' whose value does not correspond
@@ -322,23 +321,6 @@ extern wctrans_t wctrans_l (__const char *__property, __locale_t __locale)
extern wint_t towctrans_l (wint_t __wc, wctrans_t __desc,
__locale_t __locale) __THROW;
-extern int __iswalnum_l(wint_t __wc, __locale_t __locale) __THROW;
-extern int __iswalpha_l(wint_t __wc, __locale_t __locale) __THROW;
-extern int __iswblank_l(wint_t __wc, __locale_t __locale) __THROW;
-extern int __iswcntrl_l(wint_t __wc, __locale_t __locale) __THROW;
-extern int __iswdigit_l(wint_t __wc, __locale_t __locale) __THROW;
-extern int __iswgraph_l(wint_t __wc, __locale_t __locale) __THROW;
-extern int __iswlower_l(wint_t __wc, __locale_t __locale) __THROW;
-extern int __iswprint_l(wint_t __wc, __locale_t __locale) __THROW;
-extern int __iswpunct_l(wint_t __wc, __locale_t __locale) __THROW;
-extern int __iswspace_l(wint_t __wc, __locale_t __locale) __THROW;
-extern int __iswupper_l(wint_t __wc, __locale_t __locale) __THROW;
-extern int __iswxdigit_l(wint_t __wc, __locale_t __locale) __THROW;
-extern wint_t __towlower_l(wint_t __wc, __locale_t __locale) __THROW;
-extern wint_t __towupper_l(wint_t __wc, __locale_t __locale) __THROW;
-extern int __iswctype_l(wint_t __wc, wctype_t __desc, __locale_t __locale) __THROW;
-extern wctrans_t __wctrans_l(const char *__property, __locale_t __locale) __THROW;
-extern wint_t __towctrans_l(wint_t __wc, wctrans_t __desc, __locale_t __locale) __THROW;
# endif /* Use GNU. */
__END_DECLS