diff options
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-4.5.1/204-uclibc-locale-wchar_fix.patch')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.5.1/204-uclibc-locale-wchar_fix.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.5.1/204-uclibc-locale-wchar_fix.patch b/meta/recipes-devtools/gcc/gcc-4.5.1/204-uclibc-locale-wchar_fix.patch deleted file mode 100644 index d498f8917b..0000000000 --- a/meta/recipes-devtools/gcc/gcc-4.5.1/204-uclibc-locale-wchar_fix.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | --- gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc.uclibc200_wchar~ 2006-03-10 15:32:37 +0100 | ||
4 | +++ gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2006-03-10 15:37:27 +0100 | ||
5 | @@ -401,7 +401,7 @@ | ||
6 | # ifdef __UCLIBC_HAS_XLOCALE__ | ||
7 | _M_data->_M_decimal_point = __cloc->decimal_point_wc; | ||
8 | _M_data->_M_thousands_sep = __cloc->thousands_sep_wc; | ||
9 | -# else | ||
10 | +# elif defined __UCLIBC_HAS_LOCALE__ | ||
11 | _M_data->_M_decimal_point = __global_locale->decimal_point_wc; | ||
12 | _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc; | ||
13 | # endif | ||
14 | @@ -556,7 +556,7 @@ | ||
15 | # ifdef __UCLIBC_HAS_XLOCALE__ | ||
16 | _M_data->_M_decimal_point = __cloc->decimal_point_wc; | ||
17 | _M_data->_M_thousands_sep = __cloc->thousands_sep_wc; | ||
18 | -# else | ||
19 | +# elif defined __UCLIBC_HAS_LOCALE__ | ||
20 | _M_data->_M_decimal_point = __global_locale->decimal_point_wc; | ||
21 | _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc; | ||
22 | # endif | ||
23 | --- gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc.uclibc200_wchar~ 2006-03-10 15:32:37 +0100 | ||
24 | +++ gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2006-03-10 15:37:27 +0100 | ||
25 | @@ -127,12 +127,25 @@ | ||
26 | { | ||
27 | // Named locale. | ||
28 | // NB: In the GNU model wchar_t is always 32 bit wide. | ||
29 | +#ifdef __UCLIBC_MJN3_ONLY__ | ||
30 | +#warning fix this... should be numeric | ||
31 | +#endif | ||
32 | +#ifdef __UCLIBC__ | ||
33 | +# ifdef __UCLIBC_HAS_XLOCALE__ | ||
34 | + _M_data->_M_decimal_point = __cloc->decimal_point_wc; | ||
35 | + _M_data->_M_thousands_sep = __cloc->thousands_sep_wc; | ||
36 | +# elif defined __UCLIBC_HAS_LOCALE__ | ||
37 | + _M_data->_M_decimal_point = __global_locale->decimal_point_wc; | ||
38 | + _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc; | ||
39 | +# endif | ||
40 | +#else | ||
41 | union { char *__s; wchar_t __w; } __u; | ||
42 | __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc); | ||
43 | _M_data->_M_decimal_point = __u.__w; | ||
44 | |||
45 | __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc); | ||
46 | _M_data->_M_thousands_sep = __u.__w; | ||
47 | +#endif | ||
48 | |||
49 | if (_M_data->_M_thousands_sep == L'\0') | ||
50 | _M_data->_M_grouping = ""; | ||