[commits] r3480 - in /trunk/libc: ChangeLog.eglibc locale/programs/ld-collate.c

[jimb@xxxxxxxxxx]

Author: jimb
Date: Thu Sep 13 18:41:36 2007
New Revision: 3480

Log:
	* locale/programs/ld-collate.c (collate_output): Call
	add_locale_callidx_table as required by cross-localedef changes,
	not collidx_table_finalize.

Modified:
    trunk/libc/ChangeLog.eglibc
    trunk/libc/locale/programs/ld-collate.c

Modified: trunk/libc/ChangeLog.eglibc
==============================================================================
--- trunk/libc/ChangeLog.eglibc (original)
+++ trunk/libc/ChangeLog.eglibc Thu Sep 13 18:41:36 2007
@@ -1,3 +1,9 @@
+2007-09-13  Jim Blandy  <jimb@xxxxxxxxxxxxxxxx>
+
+	* locale/programs/ld-collate.c (collate_output): Call
+	add_locale_callidx_table as required by cross-localedef changes,
+	not collidx_table_finalize.
+
 2007-09-11  Jim Blandy  <jimb@xxxxxxxxxxxxxxxx>
 
 	* nss/Makefile: Delete stray text.

Modified: trunk/libc/locale/programs/ld-collate.c
==============================================================================
--- trunk/libc/locale/programs/ld-collate.c (original)
+++ trunk/libc/locale/programs/ld-collate.c Thu Sep 13 18:41:36 2007
@@ -2357,7 +2357,7 @@
 
   wchead_table_iterate (&collate->wcheads, add_to_tablewc);
 
-  collidx_table_finalize (&tablewc);
+  add_locale_collidx_table (&file, &tablewc);
 
   memset (&atwc, 0, sizeof (atwc));