From 32c8d4b145fef47f82f2439f5226daf00022a780 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Mon, 21 May 2007 19:22:35 +0000 Subject: [PATCH] c_locale.h: Do not include , use builtins. 2007-05-21 Paolo Carlini * config/locale/gnu/c_locale.h: Do not include , use builtins. * config/locale/generic/c_locale.h: Likewise. From-SVN: r124907 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/config/locale/generic/c_locale.h | 9 ++++----- libstdc++-v3/config/locale/gnu/c_locale.h | 7 +++---- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 322e2b528f6..2c2ff95d28f 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2007-05-21 Paolo Carlini + + * config/locale/gnu/c_locale.h: Do not include , use builtins. + * config/locale/generic/c_locale.h: Likewise. + 2007-05-21 Paolo Carlini PR libstdc++/31621 diff --git a/libstdc++-v3/config/locale/generic/c_locale.h b/libstdc++-v3/config/locale/generic/c_locale.h index ac5ce772fad..42ec7b00b8a 100644 --- a/libstdc++-v3/config/locale/generic/c_locale.h +++ b/libstdc++-v3/config/locale/generic/c_locale.h @@ -45,7 +45,6 @@ #pragma GCC system_header #include -#include #include #define _GLIBCXX_NUM_CATEGORIES 0 @@ -73,8 +72,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) std::setlocale(LC_NUMERIC, "C"); } - va_list __args; - va_start(__args, __fmt); + __builtin_va_list __args; + __builtin_va_start(__args, __fmt); #ifdef _GLIBCXX_USE_C99 const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args); @@ -82,8 +81,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) const int __ret = __builtin_vsprintf(__out, __fmt, __args); #endif - va_end(__args); - + __builtin_va_end(__args); + if (__sav) { std::setlocale(LC_NUMERIC, __sav); diff --git a/libstdc++-v3/config/locale/gnu/c_locale.h b/libstdc++-v3/config/locale/gnu/c_locale.h index fae7ffec59a..33a2c07d8ac 100644 --- a/libstdc++-v3/config/locale/gnu/c_locale.h +++ b/libstdc++-v3/config/locale/gnu/c_locale.h @@ -45,7 +45,6 @@ #pragma GCC system_header #include -#include #include #define _GLIBCXX_C_LOCALE_GNU 1 @@ -84,8 +83,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) std::setlocale(LC_ALL, "C"); #endif - va_list __args; - va_start(__args, __fmt); + __builtin_va_list __args; + __builtin_va_start(__args, __fmt); #ifdef _GLIBCXX_USE_C99 const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args); @@ -93,7 +92,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) const int __ret = __builtin_vsprintf(__out, __fmt, __args); #endif - va_end(__args); + __builtin_va_end(__args); #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) __gnu_cxx::__uselocale(__old);