projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 635ab0b)
backport some fixes from 4.2 patchset to fix __global_locale error
authorMike Frysinger <vapier@gentoo.org>
Fri, 30 Jun 2006 01:22:21 +0000 (01:22 -0000)
committerMike Frysinger <vapier@gentoo.org>
Fri, 30 Jun 2006 01:22:21 +0000 (01:22 -0000)
toolchain/gcc/4.1.1/200-uclibc-locale.patch patch | blob | history

diff --git a/toolchain/gcc/4.1.1/200-uclibc-locale.patch b/toolchain/gcc/4.1.1/200-uclibc-locale.patch
index 6cfbc625097935422314dabaf2a1e9db0bf5a80c..e5d712e7234a57510d1cef42a2b9046c3e51114f 100644 (file)
--- 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