diff options
author | Ulrich Drepper <drepper@redhat.com> | 2000-10-31 03:10:13 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2000-10-31 03:10:13 +0000 |
commit | cdfb970dd9c20861d7fdac16435d70792b8a027a (patch) | |
tree | dfa5497c0b5b06408284073aa184688091b065c4 /locale/findlocale.c | |
parent | 42fea164a2f975da1b1bb687bf1a50506b59a668 (diff) | |
download | glibc-cdfb970dd9c20861d7fdac16435d70792b8a027a.tar.gz glibc-cdfb970dd9c20861d7fdac16435d70792b8a027a.tar.xz glibc-cdfb970dd9c20861d7fdac16435d70792b8a027a.zip |
Update.
* locale/findlocale.c (free_mem): We can remove NODELETE marked data, just not the C locale data. * intl/tst-gettext.c: Use setlocale() in addition to setting envvar. * intl/tst-gettext.sh: Copy locale data if necessary. * intl/Makefile (generated-dirs): Add localedir. * intl/dcigettext.c (guess_category_value): For libc always use the setlocale() method. * intl/Makefile: Add rules to build, run and, distribute tst-gettext2. * intl/tst-gettext2.c: New file. * intl/tst-gettext2.sh: New file. * intl/tstlang1.po: New file. * intl/tstlang2.po: New file. Patch by Andreas Jaeger <aj@suse.de>. 2000-10-26 GOTO Masanori <gotom@debian.or.jp> * intl/locale.alias: Add ja_JP.ujis alias. 2000-10-30 Ulrich Drepper <drepper@redhat.com>
Diffstat (limited to 'locale/findlocale.c')
-rw-r--r-- | locale/findlocale.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/locale/findlocale.c b/locale/findlocale.c index b1f940231f..162245f137 100644 --- a/locale/findlocale.c +++ b/locale/findlocale.c @@ -253,7 +253,7 @@ free_mem (void) struct loaded_l10nfile *here = runp; struct locale_data *data = (struct locale_data *) runp->data; - if (data != NULL && data->usage_count != UNDELETABLE) + if (data != NULL && data != _nl_C[category]) _nl_unload_locale (data); runp = runp->next; free ((char *) here->filename); |