about summary refs log tree commit diff
path: root/locale/programs/locfile.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-08-20 23:10:34 +0000
committerRoland McGrath <roland@gnu.org>2002-08-20 23:10:34 +0000
commit69f6a804b0947fb5c6bdbc007d71fa8b8e7bab08 (patch)
tree0c2d1beec2594f3ef81ee412e4cfee0749856d4b /locale/programs/locfile.c
parentc6c6dd4803a9ec8d7302b9ed8552ad15516baeb6 (diff)
downloadglibc-69f6a804b0947fb5c6bdbc007d71fa8b8e7bab08.tar.gz
glibc-69f6a804b0947fb5c6bdbc007d71fa8b8e7bab08.tar.xz
glibc-69f6a804b0947fb5c6bdbc007d71fa8b8e7bab08.zip
* 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/locfile.c')
-rw-r--r--locale/programs/locfile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/locale/programs/locfile.c b/locale/programs/locfile.c
index 389adf1ee3..c5e5581ac5 100644
--- a/locale/programs/locfile.c
+++ b/locale/programs/locfile.c
@@ -47,7 +47,7 @@ locfile_read (struct localedef_t *result, const struct charmap_t *charmap)
 {
   const char *filename = result->name;
   const char *repertoire_name = result->repertoire_name;
-  int locale_mask = result->needed ^ result->avail;
+  int locale_mask = result->needed & ~result->avail;
   struct linereader *ldfile;
   int not_here = ALL_LOCALES;