yann@111: --- gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc.uclibc200_wchar~	2006-03-10 15:32:37 +0100
yann@111: +++ gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc	2006-03-10 15:37:27 +0100
yann@111: @@ -401,7 +401,7 @@
yann@111:  # ifdef __UCLIBC_HAS_XLOCALE__
yann@111:  	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
yann@111:  	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
yann@111: -# else
yann@111: +# elif defined __UCLIBC_HAS_LOCALE__
yann@111:  	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
yann@111:  	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
yann@111:  # endif
yann@111: @@ -556,7 +556,7 @@
yann@111:  # ifdef __UCLIBC_HAS_XLOCALE__
yann@111:  	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
yann@111:  	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
yann@111: -# else
yann@111: +# elif defined __UCLIBC_HAS_LOCALE__
yann@111:  	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
yann@111:  	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
yann@111:  # endif
yann@111: --- gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc.uclibc200_wchar~	2006-03-10 15:32:37 +0100
yann@111: +++ gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc	2006-03-10 15:37:27 +0100
yann@111: @@ -127,12 +127,25 @@
yann@111:  	{
yann@111:  	  // Named locale.
yann@111:  	  // NB: In the GNU model wchar_t is always 32 bit wide.
yann@111: +#ifdef __UCLIBC_MJN3_ONLY__
yann@111: +#warning fix this... should be numeric
yann@111: +#endif
yann@111: +#ifdef __UCLIBC__
yann@111: +# ifdef __UCLIBC_HAS_XLOCALE__
yann@111: +	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
yann@111: +	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
yann@111: +# elif defined __UCLIBC_HAS_LOCALE__
yann@111: +	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
yann@111: +	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
yann@111: +# endif
yann@111: +#else
yann@111:  	  union { char *__s; wchar_t __w; } __u;
yann@111:  	  __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
yann@111:  	  _M_data->_M_decimal_point = __u.__w;
yann@111:  
yann@111:  	  __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
yann@111:  	  _M_data->_M_thousands_sep = __u.__w;
yann@111: +#endif
yann@111:  
yann@111:  	  if (_M_data->_M_thousands_sep == L'\0')
yann@111:  	    _M_data->_M_grouping = "";