summaryrefslogtreecommitdiff
path: root/toolchain/gcc/4.2.1/205-uclibc-locale-update.patch
diff options
context:
space:
mode:
authorUlf Samuelsson <ulf.samuelsson@atmel.com>2007-08-30 06:00:36 +0000
committerUlf Samuelsson <ulf.samuelsson@atmel.com>2007-08-30 06:00:36 +0000
commit0e75467ae3a0de2c393e1d2c460eae02488aec97 (patch)
tree87411b1b638175ae93e4e6a6c0f0646d906f117e /toolchain/gcc/4.2.1/205-uclibc-locale-update.patch
parent33b0908145f6b1f575e746846b68ac025e9cf93f (diff)
Revert patch causing g++-4.2.1 build to fail
Diffstat (limited to 'toolchain/gcc/4.2.1/205-uclibc-locale-update.patch')
-rw-r--r--toolchain/gcc/4.2.1/205-uclibc-locale-update.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/toolchain/gcc/4.2.1/205-uclibc-locale-update.patch b/toolchain/gcc/4.2.1/205-uclibc-locale-update.patch
index c9356044a..86b284455 100644
--- a/toolchain/gcc/4.2.1/205-uclibc-locale-update.patch
+++ b/toolchain/gcc/4.2.1/205-uclibc-locale-update.patch
@@ -313,11 +313,11 @@
- __convert_from_v(char* __out,
- const int __size __attribute__ ((__unused__)),
- const char* __fmt,
--#ifdef __UCLIBC_HAS_XLOCALE__
+-#ifdef __UCLIBC_HAS_XCLOCALE__
- _Tv __v, const __c_locale& __cloc, int __prec)
+ inline int
+ __convert_from_v(const __c_locale&
-+#ifndef __UCLIBC_HAS_XLOCALE__
++#ifndef __UCLIBC_HAS_XCLOCALE__
+ __cloc __attribute__ ((__unused__))
+#endif
+ ,
@@ -326,7 +326,7 @@
+ const char* __fmt, ...)
{
+ va_list __args;
-+#ifdef __UCLIBC_HAS_XLOCALE__
++#ifdef __UCLIBC_HAS_XCLOCALE__
__c_locale __old = __gnu_cxx::__uselocale(__cloc);
#else
- _Tv __v, const __c_locale&, int __prec)
@@ -343,5 +343,5 @@
+ const int __ret = std::vsnprintf(__out, __size, __fmt, __args);
+ va_end(__args);
- #ifdef __UCLIBC_HAS_XLOCALE__
+ #ifdef __UCLIBC_HAS_XCLOCALE__
__gnu_cxx::__uselocale(__old);