svn commit: trunk/buildroot/toolchain/gcc/4.1.1

[vapier at uclibc.org]

Author: vapier
Date: 2006-06-29 18:22:21 -0700 (Thu, 29 Jun 2006)
New Revision: 15550

Log:
backport some fixes from 4.2 patchset to fix __global_locale error

Modified:
   trunk/buildroot/toolchain/gcc/4.1.1/200-uclibc-locale.patch


Changeset:
Modified: trunk/buildroot/toolchain/gcc/4.1.1/200-uclibc-locale.patch
===================================================================
--- trunk/buildroot/toolchain/gcc/4.1.1/200-uclibc-locale.patch	2006-06-30 01:15:13 UTC (rev 15549)
+++ trunk/buildroot/toolchain/gcc/4.1.1/200-uclibc-locale.patch	2006-06-30 01:22:21 UTC (rev 15550)
@@ -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