OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

c_locale.h: Do not include <cstdarg>, use builtins.

Browse Source 
2007-05-21  Paolo Carlini  <pcarlini@suse.de>

	* config/locale/gnu/c_locale.h: Do not include <cstdarg>, use builtins.
	* config/locale/generic/c_locale.h: Likewise.

From-SVN: r124907
This commit is contained in:
Paolo Carlini 2007-05-21 19:22:35 +00:00 committed by Paolo Carlini
parent 9777397727
commit 32c8d4b145
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,8 @@
2007-05-21 Paolo Carlini <pcarlini@suse.de>
* config/locale/gnu/c_locale.h: Do not include <cstdarg>, use builtins.
* config/locale/generic/c_locale.h: Likewise.
2007-05-21 Paolo Carlini <pcarlini@suse.de> 2007-05-21 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/31621 PR libstdc++/31621

9
libstdc++-v3/config/locale/generic/c_locale.h
View File

@ -45,7 +45,6 @@
#pragma GCC system_header #pragma GCC system_header
#include <clocale> #include <clocale>
#include <cstdarg>
#include <cstddef> #include <cstddef>
#define _GLIBCXX_NUM_CATEGORIES 0 #define _GLIBCXX_NUM_CATEGORIES 0
@ -73,8 +72,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
std::setlocale(LC_NUMERIC, "C"); std::setlocale(LC_NUMERIC, "C");
} }
va_list __args; __builtin_va_list __args;
va_start(__args, __fmt); __builtin_va_start(__args, __fmt);
#ifdef _GLIBCXX_USE_C99 #ifdef _GLIBCXX_USE_C99
const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args); 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); const int __ret = __builtin_vsprintf(__out, __fmt, __args);
#endif #endif
va_end(__args); __builtin_va_end(__args);
if (__sav) if (__sav)
{ {
std::setlocale(LC_NUMERIC, __sav); std::setlocale(LC_NUMERIC, __sav);

7
libstdc++-v3/config/locale/gnu/c_locale.h
View File

@ -45,7 +45,6 @@
#pragma GCC system_header #pragma GCC system_header
#include <clocale> #include <clocale>
#include <cstdarg>
#include <cstddef> #include <cstddef>
#define _GLIBCXX_C_LOCALE_GNU 1 #define _GLIBCXX_C_LOCALE_GNU 1
@ -84,8 +83,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
std::setlocale(LC_ALL, "C"); std::setlocale(LC_ALL, "C");
#endif #endif
va_list __args; __builtin_va_list __args;
va_start(__args, __fmt); __builtin_va_start(__args, __fmt);
#ifdef _GLIBCXX_USE_C99 #ifdef _GLIBCXX_USE_C99
const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args); 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); const int __ret = __builtin_vsprintf(__out, __fmt, __args);
#endif #endif
va_end(__args); __builtin_va_end(__args);
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
__gnu_cxx::__uselocale(__old); __gnu_cxx::__uselocale(__old);