diff options
-rw-r--r-- | libc/ChangeLog.eglibc | 4 | ||||
-rw-r--r-- | libc/locale/programs/ld-ctype.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libc/ChangeLog.eglibc b/libc/ChangeLog.eglibc index 43d50399c..114641e77 100644 --- a/libc/ChangeLog.eglibc +++ b/libc/ChangeLog.eglibc @@ -1,3 +1,7 @@ +2009-08-03 Joseph Myers <joseph@codesourcery.com> + + * locale/programs/ld-ctype.c (ctype_output): Correct merge error. + 2009-07-27 Maxim Kuvyrkov <maxim@codesourcery.com> Add BIG_MACROS option group. diff --git a/libc/locale/programs/ld-ctype.c b/libc/locale/programs/ld-ctype.c index 65adc0d75..4b6a33568 100644 --- a/libc/locale/programs/ld-ctype.c +++ b/libc/locale/programs/ld-ctype.c @@ -1058,8 +1058,7 @@ ctype_output (struct localedef_t *locale, const struct charmap_t *charmap, 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); |