summaryrefslogtreecommitdiffstats
path: root/toolchain/gcc
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-11-28 22:20:06 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-11-28 22:20:06 +0000
commit667d0251d0324abb040771c20c47d6126ab38ef6 (patch)
tree1dc673993337d433702abf7ccdfd65b8aff6fa1e /toolchain/gcc
parent09a5e86914ee936ccf262def3133c4bd5d369c41 (diff)
fix locale stuff (and there was much rejoicing)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5671 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/gcc')
-rw-r--r--toolchain/gcc/patches/4.1.1/200-uclibc-locale.patch10
1 files changed, 5 insertions, 5 deletions
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 681e81e27..e5d712e72 100644
--- 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;
-+# 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
@@ -3120,13 +3120,13 @@
+ GLIBCXX_CHECK_WCHAR_T_SUPPORT
+
+ # For LFS.
-+ GLIBCXX_CHECK_INT64_T
++ AC_DEFINE(HAVE_INT64_T)
+ case "$target" in
+ *-uclinux*)
+ # Don't enable LFS with uClinux
+ ;;
+ *)
-+ GLIBCXX_USE_LFS
++ AC_DEFINE(_GLIBCXX_USE_LFS)
+ esac
+
+ # For showmanyc_helper().