From 7b9e1271ef5340cd6effbf583c09241a1d71ab12 Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Tue, 28 Nov 2006 22:20:06 +0000 Subject: [PATCH] fix locale stuff (and there was much rejoicing) SVN-Revision: 5671 --- toolchain/gcc/patches/4.1.1/200-uclibc-locale.patch | 10 +++++----- 1 file 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 681e81e27c..e5d712e723 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(). -- 2.25.1