summary refs log tree commit diff
path: root/intl
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-08-02 21:04:06 +0000
committerRoland McGrath <roland@gnu.org>2002-08-02 21:04:06 +0000
commit174d73a3bad55f7359c49c82474e9991871d0e2f (patch)
tree2bec465ea339c2c3a5c634b1e3c08a655db04f94 /intl
parentae309ba9e4f88118c23cd925cef2d457a42f4404 (diff)
downloadglibc-174d73a3bad55f7359c49c82474e9991871d0e2f.tar.gz
glibc-174d73a3bad55f7359c49c82474e9991871d0e2f.tar.xz
glibc-174d73a3bad55f7359c49c82474e9991871d0e2f.zip
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 'intl')
-rw-r--r--intl/loadmsgcat.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
index 19a3e9b8e5..b9e59f5682 100644
--- a/intl/loadmsgcat.c
+++ b/intl/loadmsgcat.c
@@ -805,7 +805,7 @@ _nl_init_domain_conv (domain_file, domain, domainbinding)
 	      if (outcharset == NULL || outcharset[0] == '\0')
 		{
 # ifdef _LIBC
-		  outcharset = (*_nl_current[LC_CTYPE])->values[_NL_ITEM_INDEX (CODESET)].string;
+		  outcharset = _NL_CURRENT (LC_CTYPE, CODESET);
 # else
 #  if HAVE_ICONV
 		  extern const char *locale_charset (void);