remove old variables

[openwrt.git] / toolchain / gcc / patches / 4.1.1 / 200-uclibc-locale.patch

diff --git a/toolchain/gcc/patches/4.1.1/200-uclibc-locale.patch b/toolchain/gcc/patches/4.1.1/200-uclibc-locale.patch
index 6cfbc62..e5d712e 100644 (file)
--- a/toolchain/gcc/patches/4.1.1/200-uclibc-locale.patch
+++ b/toolchain/gcc/patches/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;
 +# 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
 +        _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;
 +# 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
 +        _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;
 +# 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
 +        _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
 +        _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
 +# endif