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 /intl/dcigettext.c | |
| parent | 42fea164a2f975da1b1bb687bf1a50506b59a668 (diff) | |
| download | glibc-cdfb970dd9c20861d7fdac16435d70792b8a027a.zip glibc-cdfb970dd9c20861d7fdac16435d70792b8a027a.tar.gz glibc-cdfb970dd9c20861d7fdac16435d70792b8a027a.tar.bz2 | |
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 'intl/dcigettext.c')
| -rw-r--r-- | intl/dcigettext.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intl/dcigettext.c b/intl/dcigettext.c index 7d7081d..c47cccf 100644 --- a/intl/dcigettext.c +++ b/intl/dcigettext.c @@ -1079,7 +1079,7 @@ guess_category_value (category, categoryname) /* `LANGUAGE' is not set. So we have to proceed with the POSIX methods of looking to `LC_ALL', `LC_xxx', and `LANG'. On some systems this can be done by the `setlocale' function itself. */ -#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL +#if defined _LIBC || (defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL) return setlocale (category, NULL); #else /* Setting of LC_ALL overwrites all other. */ |