Home Esplora Aiuto
Accedi
PUBLIC_REPOS
/
buildroot
mirror da git://git.buildroot.net/buildroot
2
1
Forka 0
File
Albero (Tree): c901bef2c8
Rami (Branch) Tag
buildroot
/
toolchain
/
gcc
/
4.2.4
/
204-uclibc-locale-wchar_fix.patch

204-uclibc-locale-wchar_fix.patch 1.9 KB
Cronologia Originale

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748 
  1. --- gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc.uclibc200_wchar~	2006-03-10 15:32:37 +0100
    2. 

  2. +++ gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc	2006-03-10 15:37:27 +0100
    3. 

  3. @@ -401,7 +401,7 @@
    4. 

  4.  # ifdef __UCLIBC_HAS_XLOCALE__
    5. 

  5.  	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
    6. 

  6.  	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
    7. 

  7. -# else
    8. 

  8. +# elif defined __UCLIBC_HAS_LOCALE__
    9. 

  9.  	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
    10. 

  10.  	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
    11. 

  11.  # endif
    12. 

  12. @@ -556,7 +556,7 @@
    13. 

  13.  # ifdef __UCLIBC_HAS_XLOCALE__
    14. 

  14.  	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
    15. 

  15.  	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
    16. 

  16. -# else
    17. 

  17. +# elif defined __UCLIBC_HAS_LOCALE__
    18. 

  18.  	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
    19. 

  19.  	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
    20. 

  20.  # endif
    21. 

  21. --- gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc.uclibc200_wchar~	2006-03-10 15:32:37 +0100
    22. 

  22. +++ gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc	2006-03-10 15:37:27 +0100
    23. 

  23. @@ -127,12 +127,25 @@
    24. 

  24.  	{
    25. 

  25.  	  // Named locale.
    26. 

  26.  	  // NB: In the GNU model wchar_t is always 32 bit wide.
    27. 

  27. +#ifdef __UCLIBC_MJN3_ONLY__
    28. 

  28. +#warning fix this... should be numeric
    29. 

  29. +#endif
    30. 

  30. +#ifdef __UCLIBC__
    31. 

  31. +# ifdef __UCLIBC_HAS_XLOCALE__
    32. 

  32. +	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
    33. 

  33. +	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
    34. 

  34. +# elif defined __UCLIBC_HAS_LOCALE__
    35. 

  35. +	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
    36. 

  36. +	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
    37. 

  37. +# endif
    38. 

  38. +#else
    39. 

  39.  	  union { char *__s; wchar_t __w; } __u;
    40. 

  40.  	  __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
    41. 

  41.  	  _M_data->_M_decimal_point = __u.__w;
    42. 

  42.  
    43. 

  43.  	  __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
    44. 

  44.  	  _M_data->_M_thousands_sep = __u.__w;
    45. 

  45. +#endif
    46. 

  46.  
    47. 

  47.  	  if (_M_data->_M_thousands_sep == L'\0')
    48. 

  48.  	    _M_data->_M_grouping = "";
    49.