diff options
| author | Roland McGrath <roland@gnu.org> | 2002-08-20 23:10:34 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2002-08-20 23:10:34 +0000 |
| commit | 69f6a804b0947fb5c6bdbc007d71fa8b8e7bab08 (patch) | |
| tree | 0c2d1beec2594f3ef81ee412e4cfee0749856d4b /locale/programs/localedef.c | |
| parent | c6c6dd4803a9ec8d7302b9ed8552ad15516baeb6 (diff) | |
| download | glibc-69f6a804b0947fb5c6bdbc007d71fa8b8e7bab08.zip glibc-69f6a804b0947fb5c6bdbc007d71fa8b8e7bab08.tar.gz glibc-69f6a804b0947fb5c6bdbc007d71fa8b8e7bab08.tar.bz2 | |
* locale/programs/localedef.c (add_to_readlist): Error about
circular dependencies only if the locale in question hasn't
been finished.
* locale/programs/linereader.c (get_string): Pass LC_CTYPE not
CTYPE_LOCALE to load_locale.
* locale/programs/locfile.c (locfile_read): Don't include
unneeded but available locales in locale_mask.
* locale/programs/locarchive.c (enlarge_archive): If quiet, don't
print any messages about enlarging archive.
Diffstat (limited to 'locale/programs/localedef.c')
| -rw-r--r-- | locale/programs/localedef.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c index 5bbf0bf..64b1d44 100644 --- a/locale/programs/localedef.c +++ b/locale/programs/localedef.c @@ -561,7 +561,9 @@ add_to_readlist (int locale, const char *name, const char *repertoire_name, } } - if (generate && (runp->needed & (1 << locale)) != 0) + if (generate + && (runp->needed & (1 << locale)) != 0 + && (runp->avail & (1 << locale)) == 0) WITH_CUR_LOCALE (error (5, 0, _("\ circular dependencies between locale definitions"))); |