From 2def5b76e3bc2b9ad6b96a56daed4c51dfa6dd03 Mon Sep 17 00:00:00 2001
From: Paolo Carlini <pcarlini@unitus.it>
Date: Mon, 14 Jul 2003 21:46:29 +0200
Subject: [PATCH] c_locale.h (__convert_from_v): Include <cstdio>.

2003-07-14  Paolo Carlini  <pcarlini@unitus.it>

	* config/locale/gnu/c_locale.h (__convert_from_v): Include
	<cstdio>. Qualify names.
	* config/locale/generic/c_locale.h (__convert_from_v): Ditto.

From-SVN: r69343
---
 libstdc++-v3/ChangeLog                        |  6 +++++
 libstdc++-v3/config/locale/generic/c_locale.h | 25 ++++++++++---------
 libstdc++-v3/config/locale/gnu/c_locale.h     |  5 ++--
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 24bde10073a..33dc3df44cf 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-14  Paolo Carlini  <pcarlini@unitus.it>
+
+	* config/locale/gnu/c_locale.h (__convert_from_v): Include
+	<cstdio>. Qualify names.
+	* config/locale/generic/c_locale.h (__convert_from_v): Ditto.
+
 2003-07-14  Paolo Carlini  <pcarlini@unitus.it>
 	    Nathan C. Myers  <ncm-nospam@cantrip.org>
 
diff --git a/libstdc++-v3/config/locale/generic/c_locale.h b/libstdc++-v3/config/locale/generic/c_locale.h
index 72565fbe0d2..8e2072a75b3 100644
--- a/libstdc++-v3/config/locale/generic/c_locale.h
+++ b/libstdc++-v3/config/locale/generic/c_locale.h
@@ -39,8 +39,9 @@
 #pragma GCC system_header
 
 #include <clocale>
-#include <cstdlib>
-#include <cstring>
+#include <cstdlib>   // get std::malloc
+#include <cstring>   // get std::strlen
+#include <cstdio>    // get std::snprintf or std::sprintf
 
 #define _GLIBCXX_NUM_CATEGORIES 0
 
@@ -59,26 +60,26 @@ namespace std
 		     const char* __fmt,
 		     _Tv __v, const __c_locale&, int __prec = -1)
     {
-      char* __old = setlocale(LC_ALL, NULL);
-      char* __sav = static_cast<char*>(malloc(strlen(__old) + 1));
+      char* __old = std::setlocale(LC_ALL, NULL);
+      char* __sav = static_cast<char*>(std::malloc(std::strlen(__old) + 1));
       if (__sav)
-        strcpy(__sav, __old);
-      setlocale(LC_ALL, "C");
+        std::strcpy(__sav, __old);
+      std::setlocale(LC_ALL, "C");
 
       int __ret;
 #ifdef _GLIBCXX_USE_C99
       if (__prec >= 0)
-        __ret = snprintf(__out, __size, __fmt, __prec, __v);
+        __ret = std::snprintf(__out, __size, __fmt, __prec, __v);
       else
-        __ret = snprintf(__out, __size, __fmt, __v);
+        __ret = std::snprintf(__out, __size, __fmt, __v);
 #else
       if (__prec >= 0)
-        __ret = sprintf(__out, __fmt, __prec, __v);
+        __ret = std::sprintf(__out, __fmt, __prec, __v);
       else
-        __ret = sprintf(__out, __fmt, __v);
+        __ret = std::sprintf(__out, __fmt, __v);
 #endif
-      setlocale(LC_ALL, __sav);
-      free(__sav);
+      std::setlocale(LC_ALL, __sav);
+      std::free(__sav);
       return __ret;
     }
 }
diff --git a/libstdc++-v3/config/locale/gnu/c_locale.h b/libstdc++-v3/config/locale/gnu/c_locale.h
index 5ead068ea04..24636f4893d 100644
--- a/libstdc++-v3/config/locale/gnu/c_locale.h
+++ b/libstdc++-v3/config/locale/gnu/c_locale.h
@@ -40,6 +40,7 @@
 
 #include <cstring>              // get std::strlen
 #include <cstdlib>              // get std::malloc
+#include <cstdio>               // get std::snprintf or std::sprintf
 #include <clocale>
 #include <langinfo.h>		// For codecvt
 #include <iconv.h>		// For codecvt using iconv, iconv_t
@@ -84,9 +85,9 @@ namespace std
       int __ret;
 #ifdef _GLIBCXX_USE_C99
       if (__prec >= 0)
-        __ret = snprintf(__out, __size, __fmt, __prec, __v);
+        __ret = std::snprintf(__out, __size, __fmt, __prec, __v);
       else
-        __ret = snprintf(__out, __size, __fmt, __v);
+        __ret = std::snprintf(__out, __size, __fmt, __v);
 #else
       if (__prec >= 0)
         __ret = std::sprintf(__out, __fmt, __prec, __v);