From d6cd9169dcb6d5f276c43fefe91428240d7552d3 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 3 Mar 2009 09:28:45 +0000 Subject: * libc/locale/locale.c (_setlocale_r): New implementation based on FreeBSD's setlocale. (currentlocale): New helper function. (loadlocale): Ditto. (__locale_charset): New function. (__locale_msgcharset): Rename from __locale_charset. * libc/ctype/local.h (__lc_ctype): Remove declaration. (__locale_charset): Declare. * libc/ctype/iswalpha.c (iswalpha): Call __locale_charset instead of using __lc_ctype directly. Only compare against the charset alone. * libc/ctype/iswblank.c (iswblank): Ditto. * libc/ctype/iswcntrl.c (iswcntrl): Ditto. * libc/ctype/iswprint.c (iswprint): Ditto. * libc/ctype/iswpunct.c (iswpunct): Ditto. * libc/ctype/iswspace.c (iswspace): Ditto. * libc/ctype/towlower.c (towlower): Ditto. * libc/ctype/towupper.c (towupper): Ditto. * libc/stdlib/mbtowc_r.c (_mbtowc_r): Ditto. * libc/stdlib/wctomb_r.c (_wctomb_r): Ditto. * libc/sys/linux/intl/loadmsgcat.c (_nl_init_domain_conv): Call __locale_msgcharset instead of __locale_charset. --- newlib/libc/sys/linux/intl/loadmsgcat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'newlib/libc/sys/linux/intl/loadmsgcat.c') diff --git a/newlib/libc/sys/linux/intl/loadmsgcat.c b/newlib/libc/sys/linux/intl/loadmsgcat.c index b5f722e3b..0e5464a20 100644 --- a/newlib/libc/sys/linux/intl/loadmsgcat.c +++ b/newlib/libc/sys/linux/intl/loadmsgcat.c @@ -266,8 +266,8 @@ _nl_init_domain_conv (domain_file, domain, domainbinding) outcharset = (*_nl_current[LC_CTYPE])->values[_NL_ITEM_INDEX (CODESET)].string; # else # if HAVE_ICONV - extern const char *__locale_charset (void); - outcharset = __locale_charset (); + extern const char *__locale_msgcharset (void); + outcharset = __locale_msgcharset (); # endif # endif } -- cgit v1.2.3