[commits] r12349 - in /branches/eglibc-2_12/libc: ChangeLog.eglibc locale/xlocale.c wcsmbs/wcsmbsload.c

[maxim@xxxxxxxxxx]

Author: maxim
Date: Sun Dec 19 10:20:52 2010
New Revision: 12349

Log:
	Backport from trunk:
	2010-12-19  Gordon Schumacher  <whiplash@xxxxxxxxx>
	* locale/xlocale.x (DEFINE_CATEGORY): Fix merge issue.
	* wcsmbs/wcsmbsload.c (wcsmbs_load_conv): Same.

Modified:
    branches/eglibc-2_12/libc/ChangeLog.eglibc
    branches/eglibc-2_12/libc/locale/xlocale.c
    branches/eglibc-2_12/libc/wcsmbs/wcsmbsload.c

Modified: branches/eglibc-2_12/libc/ChangeLog.eglibc
==============================================================================
--- branches/eglibc-2_12/libc/ChangeLog.eglibc (original)
+++ branches/eglibc-2_12/libc/ChangeLog.eglibc Sun Dec 19 10:20:52 2010
@@ -1,3 +1,10 @@
+2010-12-19  Maxim Kuvyrkov  <maxim@xxxxxxxxxxxxxxxx>
+
+	Backport from trunk:
+	2010-12-19  Gordon Schumacher  <whiplash@xxxxxxxxx>
+	* locale/xlocale.x (DEFINE_CATEGORY): Fix merge issue.
+	* wcsmbs/wcsmbsload.c (wcsmbs_load_conv): Same.
+
 2010-03-31  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* manual/Makefile (stamp-pkgvers): Substitute @@ for @ in

Modified: branches/eglibc-2_12/libc/locale/xlocale.c
==============================================================================
--- branches/eglibc-2_12/libc/locale/xlocale.c (original)
+++ branches/eglibc-2_12/libc/locale/xlocale.c Sun Dec 19 10:20:52 2010
@@ -84,7 +84,7 @@
    pointers here.  */
 #if defined (NL_CURRENT_INDIRECT)
 #define DEFINE_CATEGORY(category, category_name, items, a)      \
-  __thread struct locale_data * const *_nl_current_##category   \
+  __thread struct __locale_data * const *_nl_current_##category   \
   attribute_hidden = &_nl_C_locobj.__locales[category];
 #include "categories.def"
 #undef DEFINE_CATEGORY

Modified: branches/eglibc-2_12/libc/wcsmbs/wcsmbsload.c
==============================================================================
--- branches/eglibc-2_12/libc/wcsmbs/wcsmbsload.c (original)
+++ branches/eglibc-2_12/libc/wcsmbs/wcsmbsload.c Sun Dec 19 10:20:52 2010
@@ -218,7 +218,7 @@
 #else
 void
 internal_function
-__wcsmbs_load_conv (struct locale_data *new_category)
+__wcsmbs_load_conv (struct __locale_data *new_category)
 {
   /* When OPTION_EGLIBC_LOCALE_CODE is disabled, we should never reach
      this point: there is no way to change locales, so every locale