aboutsummaryrefslogtreecommitdiff
path: root/wctype
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 /wctype
parentae309ba9e4f88118c23cd925cef2d457a42f4404 (diff)
downloadglibc-174d73a3bad55f7359c49c82474e9991871d0e2f.tar
glibc-174d73a3bad55f7359c49c82474e9991871d0e2f.tar.gz
glibc-174d73a3bad55f7359c49c82474e9991871d0e2f.tar.bz2
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 'wctype')
-rw-r--r--wctype/wctrans.c6
-rw-r--r--wctype/wctype.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/wctype/wctrans.c b/wctype/wctrans.c
index 4384c7b2f8..0f921efd0a 100644
--- a/wctype/wctrans.c
+++ b/wctype/wctrans.c
@@ -1,6 +1,6 @@
-/* Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1996,97,99,2000,02 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996.
+ Contributed by Ulrich Drepper <drepper@gnu.org>, 1996.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -44,5 +44,5 @@ wctrans (const char *property)
return 0;
i = _NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_MAP_OFFSET) + cnt;
- return (wctrans_t) _nl_current_LC_CTYPE->values[i].string;
+ return (wctrans_t) _NL_CURRENT_DATA (LC_CTYPE)->values[i].string;
}
diff --git a/wctype/wctype.c b/wctype/wctype.c
index fc1927c450..9168929282 100644
--- a/wctype/wctype.c
+++ b/wctype/wctype.c
@@ -1,6 +1,6 @@
-/* Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1996,97,98,2000,02 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996.
+ Contributed by Ulrich Drepper <drepper@gnu.org>, 1996.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -44,6 +44,6 @@ __wctype (const char *property)
}
i = _NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_CLASS_OFFSET) + result;
- return (wctype_t) _nl_current_LC_CTYPE->values[i].string;
+ return (wctype_t) _NL_CURRENT_DATA (LC_CTYPE)->values[i].string;
}
weak_alias (__wctype, wctype)