diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | elf/Makefile | 2 | ||||
| -rw-r--r-- | locale/nl_langinfo.c | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 3025aeab19..9bbbbd8c5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2002-08-03 Roland McGrath <roland@redhat.com> + * locale/nl_langinfo.c: Use _NL_CURRENT_DATA. + + * elf/Makefile (CFLAGS-vismod2.c): New variable. + * locale/setlocale.c (_nl_current_names): Variable moved ... * locale/localename.c (_nl_current_names): ... here, new file. Make it global, with attribute_hidden. diff --git a/elf/Makefile b/elf/Makefile index 71610a62bf..9c495331b2 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -147,6 +147,8 @@ modules-nodelete-yes = nodelmod1 nodelmod2 nodelmod3 nodelmod4 modules-nodlopen-yes = nodlopenmod nodlopenmod2 extra-objs += $(addsuffix .os,$(strip $(modules-names))) +CFLAGS-vismod2.c := -DNOT_IN_libc + include ../Rules ifeq (yes,$(build-shared)) diff --git a/locale/nl_langinfo.c b/locale/nl_langinfo.c index 7b62c73c63..acaa50046e 100644 --- a/locale/nl_langinfo.c +++ b/locale/nl_langinfo.c @@ -1,5 +1,5 @@ /* User interface for extracting locale-dependent parameters. - Copyright (C) 1995,1996,1997,1999,2000,2001 Free Software Foundation, Inc. + Copyright (C) 1995,96,97,99,2000,01,02 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 @@ -48,7 +48,7 @@ nl_langinfo (item) #ifdef USE_IN_EXTENDED_LOCALE_MODEL data = l->__locales[category]; #else - data = *_nl_current[category]; + data = _NL_CURRENT_DATA (category); #endif if (index >= data->nstrings) |