diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2007-05-17 16:10:10 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2007-05-17 16:10:10 +0000 |
| commit | 9940897603862c41e0773e91698d9dc650e1f6e6 (patch) | |
| tree | 8407c914b1abf9a803c03e11c768db424c420065 /libstdc++-v3/config | |
| parent | 85ee35cae8d4fee35ea2045b81a1ad9509a8749a (diff) | |
| download | gcc-9940897603862c41e0773e91698d9dc650e1f6e6.zip gcc-9940897603862c41e0773e91698d9dc650e1f6e6.tar.gz gcc-9940897603862c41e0773e91698d9dc650e1f6e6.tar.bz2 | |
c_locale.h: Do not include <libintl.h>.
2007-05-17 Paolo Carlini <pcarlini@suse.de>
* config/locale/gnu/c_locale.h: Do not include <libintl.h>.
* config/locale/gnu/messages_members.h: Do it here.
* config/locale/gnu/c_locale.h: Do not include <cstdio>, use
the builtins.
* config/locale/generic/c_locale.h: Likewise.
From-SVN: r124803
Diffstat (limited to 'libstdc++-v3/config')
| -rw-r--r-- | libstdc++-v3/config/locale/generic/c_locale.h | 5 | ||||
| -rw-r--r-- | libstdc++-v3/config/locale/gnu/c_locale.h | 6 | ||||
| -rw-r--r-- | libstdc++-v3/config/locale/gnu/messages_members.h | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/libstdc++-v3/config/locale/generic/c_locale.h b/libstdc++-v3/config/locale/generic/c_locale.h index c5e3f25..ac5ce77 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 <clocale> -#include <cstdio> // get std::vsnprintf or std::vsprintf #include <cstdarg> #include <cstddef> @@ -78,9 +77,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std) va_start(__args, __fmt); #ifdef _GLIBCXX_USE_C99 - const int __ret = std::vsnprintf(__out, __size, __fmt, __args); + const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args); #else - const int __ret = std::vsprintf(__out, __fmt, __args); + const int __ret = __builtin_vsprintf(__out, __fmt, __args); #endif va_end(__args); diff --git a/libstdc++-v3/config/locale/gnu/c_locale.h b/libstdc++-v3/config/locale/gnu/c_locale.h index 0e1aa76..fae7ffe 100644 --- a/libstdc++-v3/config/locale/gnu/c_locale.h +++ b/libstdc++-v3/config/locale/gnu/c_locale.h @@ -44,9 +44,7 @@ #pragma GCC system_header -#include <cstdio> // get std::vsnprintf or std::vsprintf #include <clocale> -#include <libintl.h> // For messages #include <cstdarg> #include <cstddef> @@ -90,9 +88,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std) va_start(__args, __fmt); #ifdef _GLIBCXX_USE_C99 - const int __ret = std::vsnprintf(__out, __size, __fmt, __args); + const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args); #else - const int __ret = std::vsprintf(__out, __fmt, __args); + const int __ret = __builtin_vsprintf(__out, __fmt, __args); #endif va_end(__args); diff --git a/libstdc++-v3/config/locale/gnu/messages_members.h b/libstdc++-v3/config/locale/gnu/messages_members.h index 21e4ccb..bfe2533 100644 --- a/libstdc++-v3/config/locale/gnu/messages_members.h +++ b/libstdc++-v3/config/locale/gnu/messages_members.h @@ -39,6 +39,8 @@ // Written by Benjamin Kosnik <bkoz@redhat.com> +#include <libintl.h> + _GLIBCXX_BEGIN_NAMESPACE(std) // Non-virtual member functions. |