summaryrefslogtreecommitdiff
path: root/libc/misc/locale/locale.c
diff options
context:
space:
mode:
authorManuel Novoa III <mjn3@codepoet.org>2004-02-11 23:48:50 +0000
committerManuel Novoa III <mjn3@codepoet.org>2004-02-11 23:48:50 +0000
commit082e680bd54e999f2bb4eb77141958938b1e9ee9 (patch)
tree203c45b85ca608e1550d8ffc459456fc9cf0b30b /libc/misc/locale/locale.c
parent17c21765b4a97c6f0b74ba8466073e5a3f97cdee (diff)
New stdio core. Should be more maintainable. Fixes a couple of bugs.
Codepaths streamlined. Improved performance for nonthreaded apps when linked with a thread-enabled libc. Minor iconv bug and some locale/thread related startup issues fixed. These showed up in getting a gcj-compiled java helloworld app running. Removed some old extension functions... _stdio_fdout and _stdio_fsfopen.
Diffstat (limited to 'libc/misc/locale/locale.c')
-rw-r--r--libc/misc/locale/locale.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/misc/locale/locale.c b/libc/misc/locale/locale.c
index cf058ce3e..c6a1a2dd0 100644
--- a/libc/misc/locale/locale.c
+++ b/libc/misc/locale/locale.c
@@ -346,7 +346,7 @@ struct lconv *localeconv(void)
/**********************************************************************/
#if defined(L__locale_init) && !defined(__LOCALE_C_ONLY)
-static __uclibc_locale_t __global_locale_data;
+__uclibc_locale_t __global_locale_data;
__locale_t __global_locale = &__global_locale_data;
@@ -1420,7 +1420,7 @@ int __locale_mbrtowc_l(wchar_t *__restrict dst,
mbstate_t ps;
const char *p = src;
size_t r;
- ps.mask = 0;
+ ps.__mask = 0;
r = _wchar_utf8sntowcs(dst, 1, &p, SIZE_MAX, &ps, 1);
return (r == 1) ? (p-src) : r; /* Need to return 0 if nul char. */
}