diff options
author | Jakub Jelinek <jakub@redhat.com> | 2008-11-12 20:29:35 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2008-11-12 20:29:35 +0000 |
commit | 03c8e287448a12c8c4c6db3570f5b7e3930d488d (patch) | |
tree | 6227d4a8b3362cade23f1a5bdf6065c4e4a415ec /locale/uselocale.c | |
parent | c02fa54041a68c12107ec577770ff81329af3bef (diff) |
Updated to fedora-glibc-20081112T2008cvs/fedora-glibc-2_8_90-17
Diffstat (limited to 'locale/uselocale.c')
-rw-r--r-- | locale/uselocale.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/locale/uselocale.c b/locale/uselocale.c index 6a54b58a27..ec5dc8f356 100644 --- a/locale/uselocale.c +++ b/locale/uselocale.c @@ -1,5 +1,5 @@ /* uselocale -- fetch and set the current per-thread locale - Copyright (C) 2002, 2004, 2007 Free Software Foundation, Inc. + Copyright (C) 2002, 2004, 2007, 2008 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -35,7 +35,7 @@ __uselocale (locale_t newloc) { const locale_t locobj = newloc == LC_GLOBAL_LOCALE ? &_nl_global_locale : newloc; - __libc_tsd_set (LOCALE, locobj); + __libc_tsd_set (__locale_t, LOCALE, locobj); #ifdef NL_CURRENT_INDIRECT /* Now we must update all the per-category thread-local variables to @@ -63,9 +63,11 @@ __uselocale (locale_t newloc) #endif /* Update the special tsd cache of some locale data. */ - __libc_tsd_set (CTYPE_B, (void *) locobj->__ctype_b); - __libc_tsd_set (CTYPE_TOLOWER, (void *) locobj->__ctype_tolower); - __libc_tsd_set (CTYPE_TOUPPER, (void *) locobj->__ctype_toupper); + __libc_tsd_set (const uint16_t *, CTYPE_B, (void *) locobj->__ctype_b); + __libc_tsd_set (const int32_t *, CTYPE_TOLOWER, + (void *) locobj->__ctype_tolower); + __libc_tsd_set (const int32_t *, CTYPE_TOUPPER, + (void *) locobj->__ctype_toupper); } return oldloc == &_nl_global_locale ? LC_GLOBAL_LOCALE : oldloc; |