diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2009-08-03 19:52:51 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2009-08-03 19:52:51 +0000 |
| commit | e6ab798eb7a34667bce399a7ef4349adb5d3b085 (patch) | |
| tree | d66e0011528e8023ad556969065889d7410828c6 | |
| parent | 863cffc9ec88bcd81438275c509066ac24ee6387 (diff) | |
| download | eglibc2-e6ab798eb7a34667bce399a7ef4349adb5d3b085.tar.gz | |
* locale/programs/ld-ctype.c (ctype_output): Correct merge error.
git-svn-id: svn://svn.eglibc.org/trunk@8760 7b3dc134-2b1b-0410-93df-9e9f96275f8d
| -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); |