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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 31ef4abb4bc5777ecb9b43faf36ade81fabde676..6d5c5d413e2dabb2535fd4b77ac3190cff06eb9a 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+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.
+
 2007-05-17  Benjamin Kosnik  <bkoz@redhat.com>
 
        * acinclude.m4 (GLIBCXX_CHECK_COMPILER_FEATURES): Add -g to

diff --git a/libstdc++-v3/config/locale/generic/c_locale.h b/libstdc++-v3/config/locale/generic/c_locale.h
index c5e3f25d8861b83ba7be1169b76a9861a5f4d24f..ac5ce772fadaada57d16437789717d97f8a8a0af 100644 (file)
--- 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 0e1aa760f249f8cc35ca6c150bcd08aa33d40bff..fae7ffec59aca0a00447f281cb4edda85af2736d 100644 (file)
--- 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 21e4ccb0626213c32d0262b33d638669fcc336f1..bfe2533369797b06cbd2a06e82672e865a0b9d5c 100644 (file)
--- 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.