Переглянути джерело

backport some fixes from 4.2 patchset to fix __global_locale error

Mike Frysinger 19 роки тому
батько
коміт
7bff1ba4ac
1 змінених файлів з 3 додано та 3 видалено
  1. 3 3
      toolchain/gcc/4.1.1/200-uclibc-locale.patch

+ 3 - 3
toolchain/gcc/4.1.1/200-uclibc-locale.patch

@@ -1747,7 +1747,7 @@
 +# ifdef __UCLIBC_HAS_XLOCALE__
 +	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
 +	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
-+# else
++# elif defined __UCLIBC_HAS_LOCALE__
 +	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
 +	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
 +# endif
@@ -1902,7 +1902,7 @@
 +# ifdef __UCLIBC_HAS_XLOCALE__
 +	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
 +	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
-+# else
++# elif defined __UCLIBC_HAS_LOCALE__
 +	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
 +	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
 +# endif
@@ -2174,7 +2174,7 @@
 +# ifdef __UCLIBC_HAS_XLOCALE__
 +	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
 +	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
-+# else
++# elif defined __UCLIBC_HAS_LOCALE__
 +	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
 +	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
 +# endif