From 9940897603862c41e0773e91698d9dc650e1f6e6 Mon Sep 17 00:00:00 2001
From: Paolo Carlini <pcarlini@suse.de>
Date: Thu, 17 May 2007 16:10:10 +0000
Subject: [PATCH] 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
---
 libstdc++-v3/ChangeLog                            | 9 +++++++++
 libstdc++-v3/config/locale/generic/c_locale.h     | 5 ++---
 libstdc++-v3/config/locale/gnu/c_locale.h         | 6 ++----
 libstdc++-v3/config/locale/gnu/messages_members.h | 2 ++
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 31ef4abb4bc..6d5c5d413e2 100644
--- 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 c5e3f25d886..ac5ce772fad 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 0e1aa760f24..fae7ffec59a 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 21e4ccb0626..bfe25333697 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.