aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Mike Frysinger <vapier@gentoo.org>2006-06-30 01:22:21 +0000
committerGravatar Mike Frysinger <vapier@gentoo.org>2006-06-30 01:22:21 +0000
commit7bff1ba4ac9672ea2f935b29c71daa8ba6193000 (patch)
treee00288061236fd84e90beb4931588862ff864d92
parent635ab0bbe4fdbffce3127487e79dff6192ed1af7 (diff)
downloadbuildroot-7bff1ba4ac9672ea2f935b29c71daa8ba6193000.tar.gz
buildroot-7bff1ba4ac9672ea2f935b29c71daa8ba6193000.tar.bz2
backport some fixes from 4.2 patchset to fix __global_locale error
-rw-r--r--toolchain/gcc/4.1.1/200-uclibc-locale.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/toolchain/gcc/4.1.1/200-uclibc-locale.patch b/toolchain/gcc/4.1.1/200-uclibc-locale.patch
index 6cfbc62509..e5d712e723 100644
--- a/toolchain/gcc/4.1.1/200-uclibc-locale.patch
+++ b/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