mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-30 05:51:45 -09:00
backport some fixes from 4.2 patchset to fix __global_locale error
This commit is contained in:
@@ -1747,7 +1747,7 @@
|
|||||||
+# ifdef __UCLIBC_HAS_XLOCALE__
|
+# ifdef __UCLIBC_HAS_XLOCALE__
|
||||||
+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
|
+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
|
||||||
+ _M_data->_M_thousands_sep = __cloc->thousands_sep_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_decimal_point = __global_locale->decimal_point_wc;
|
||||||
+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
|
+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
|
||||||
+# endif
|
+# endif
|
||||||
@@ -1902,7 +1902,7 @@
|
|||||||
+# ifdef __UCLIBC_HAS_XLOCALE__
|
+# ifdef __UCLIBC_HAS_XLOCALE__
|
||||||
+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
|
+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
|
||||||
+ _M_data->_M_thousands_sep = __cloc->thousands_sep_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_decimal_point = __global_locale->decimal_point_wc;
|
||||||
+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
|
+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
|
||||||
+# endif
|
+# endif
|
||||||
@@ -2174,7 +2174,7 @@
|
|||||||
+# ifdef __UCLIBC_HAS_XLOCALE__
|
+# ifdef __UCLIBC_HAS_XLOCALE__
|
||||||
+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
|
+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
|
||||||
+ _M_data->_M_thousands_sep = __cloc->thousands_sep_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_decimal_point = __global_locale->decimal_point_wc;
|
||||||
+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
|
+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
|
||||||
+# endif
|
+# endif
|
||||||
|
|||||||
Reference in New Issue
Block a user