From 7bff1ba4ac9672ea2f935b29c71daa8ba6193000 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 30 Jun 2006 01:22:21 +0000 Subject: backport some fixes from 4.2 patchset to fix __global_locale error --- toolchain/gcc/4.1.1/200-uclibc-locale.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'toolchain') diff --git a/toolchain/gcc/4.1.1/200-uclibc-locale.patch b/toolchain/gcc/4.1.1/200-uclibc-locale.patch index 6cfbc6250..e5d712e72 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 -- cgit v1.2.3