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

[joseph@xxxxxxxxxx]

Author: joseph
Date: Mon Aug  3 12:52:51 2009
New Revision: 8760

Log:
	* locale/programs/ld-ctype.c (ctype_output): Correct merge error.

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

Modified: trunk/libc/ChangeLog.eglibc
==============================================================================
--- trunk/libc/ChangeLog.eglibc (original)
+++ trunk/libc/ChangeLog.eglibc Mon Aug  3 12:52:51 2009
@@ -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.

Modified: trunk/libc/locale/programs/ld-ctype.c
==============================================================================
--- trunk/libc/locale/programs/ld-ctype.c (original)
+++ trunk/libc/locale/programs/ld-ctype.c Mon Aug  3 12:52:51 2009
@@ -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);