diff options
| author | maxim <maxim@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2010-12-19 18:16:43 +0000 |
|---|---|---|
| committer | maxim <maxim@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2010-12-19 18:16:43 +0000 |
| commit | e1bdacc1e71d0c59aa53f7ea1de37c3f8912d3b8 (patch) | |
| tree | 34a29c5e71420672dd8e7ababe5302c2c29dcaf2 /libc | |
| parent | 47cf7c7e49052cc93331d69c876e2e5e6a44e5d3 (diff) | |
2010-12-19 Gordon Schumacher <whiplash@pobox.com>
* locale/xlocale.x (DEFINE_CATEGORY): Fix merge issue.
* wcsmbs/wcsmbsload.c (wcsmbs_load_conv): Same.
git-svn-id: svn://svn.eglibc.org/trunk@12348 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/ChangeLog.eglibc | 5 | ||||
| -rw-r--r-- | libc/locale/xlocale.c | 2 | ||||
| -rw-r--r-- | libc/wcsmbs/wcsmbsload.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/libc/ChangeLog.eglibc b/libc/ChangeLog.eglibc index bfc141fca..8b274c63d 100644 --- a/libc/ChangeLog.eglibc +++ b/libc/ChangeLog.eglibc @@ -1,3 +1,8 @@ +2010-12-19 Gordon Schumacher <whiplash@pobox.com> + + * locale/xlocale.x (DEFINE_CATEGORY): Fix merge issue. + * wcsmbs/wcsmbsload.c (wcsmbs_load_conv): Same. + 2010-10-21 Joseph Myers <joseph@codesourcery.com> * sysdeps/powerpc/bits/mathdef.h (FP_FAST_FMA, FP_FAST_FMAF): Do diff --git a/libc/locale/xlocale.c b/libc/locale/xlocale.c index a492d27cb..669b4af0b 100644 --- a/libc/locale/xlocale.c +++ b/libc/locale/xlocale.c @@ -84,7 +84,7 @@ const struct __locale_struct _nl_C_locobj attribute_hidden = 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 diff --git a/libc/wcsmbs/wcsmbsload.c b/libc/wcsmbs/wcsmbsload.c index faa2a5b40..2c4ffa81c 100644 --- a/libc/wcsmbs/wcsmbsload.c +++ b/libc/wcsmbs/wcsmbsload.c @@ -218,7 +218,7 @@ __wcsmbs_load_conv (struct __locale_data *new_category) #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 |