[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[patches] localedef merge fix
- To: patches@xxxxxxxxxx
- Subject: [patches] localedef merge fix
- From: "Joseph S. Myers" <joseph@xxxxxxxxxxxxxxxx>
- Date: Mon, 3 Aug 2009 19:54:09 +0000 (UTC)
I've applied this patch to fix cross-localedef aborting after the last
merge because of a failure to update some new code for the cross-localedef
changes.
Index: locale/programs/ld-ctype.c
===================================================================
--- locale/programs/ld-ctype.c (revision 8759)
+++ locale/programs/ld-ctype.c (working copy)
@@ -1058,8 +1058,7 @@
CTYPE_UINT32 (_NL_CTYPE_MAP_TO_NONASCII, ctype->to_nonascii);
- CTYPE_DATA (_NL_CTYPE_NONASCII_CASE,
- &ctype->nonascii_case, sizeof (uint32_t));
+ CTYPE_UINT32 (_NL_CTYPE_NONASCII_CASE, ctype->nonascii_case);
case _NL_ITEM_INDEX (_NL_CTYPE_INDIGITS_MB_LEN):
add_locale_uint32 (&file, ctype->mbdigits_act / 10);
Index: ChangeLog.eglibc
===================================================================
--- ChangeLog.eglibc (revision 8759)
+++ ChangeLog.eglibc (working copy)
@@ -1,3 +1,7 @@
+2009-08-03 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * locale/programs/ld-ctype.c (ctype_output): Correct merge error.
+
2009-07-27 Maxim Kuvyrkov <maxim@xxxxxxxxxxxxxxxx>
Add BIG_MACROS option group.
--
Joseph S. Myers
joseph@xxxxxxxxxxxxxxxx