diff options
author | Roland McGrath <roland@gnu.org> | 2002-08-02 21:04:06 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 2002-08-02 21:04:06 +0000 |
commit | 174d73a3bad55f7359c49c82474e9991871d0e2f (patch) | |
tree | 2bec465ea339c2c3a5c634b1e3c08a655db04f94 /locale/lc-ctype.c | |
parent | ae309ba9e4f88118c23cd925cef2d457a42f4404 (diff) |
2002-08-02 Roland McGrath <roland@redhat.com>
* locale/localeinfo.h (_NL_CURRENT_DATA): New macro.
* wcsmbs/wcsmbsload.h (update_conversion_ptrs): Use it.
* locale/lc-ctype.c (_nl_postload_ctype): Likewise.
* wctype/wctrans.c (wctrans): Likewise.
* wctype/wctype.c (__wctype): Likewise.
* intl/loadmsgcat.c (_nl_init_domain_conv): Use _NL_CURRENT.
Diffstat (limited to 'locale/lc-ctype.c')
-rw-r--r-- | locale/lc-ctype.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/locale/lc-ctype.c b/locale/lc-ctype.c index 3fc23948c6..59ff7019aa 100644 --- a/locale/lc-ctype.c +++ b/locale/lc-ctype.c @@ -34,6 +34,8 @@ _NL_CURRENT_DEFINE (LC_CTYPE); void _nl_postload_ctype (void) { + const struct locale_data *data = _NL_CURRENT_DATA (LC_CTYPE); + #define paste(a,b) paste1(a,b) #define paste1(a,b) a##b @@ -58,11 +60,11 @@ _nl_postload_ctype (void) offset = _NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_CLASS_OFFSET); for (cnt = 0; cnt < 12; cnt++) - __ctype32_wctype[cnt] = _nl_current_LC_CTYPE->values[offset + cnt].string; + __ctype32_wctype[cnt] = data->values[offset + cnt].string; offset = _NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_MAP_OFFSET); for (cnt = 0; cnt < 2; cnt++) - __ctype32_wctrans[cnt] = _nl_current_LC_CTYPE->values[offset + cnt].string; + __ctype32_wctrans[cnt] = data->values[offset + cnt].string; __ctype32_width = current (char, WIDTH, 0); } |