From 3a5f525a76dac420236ed19f8f5eb81b9f527906 Mon Sep 17 00:00:00 2001
From: Stefan Sperling <stsp@cvs.openbsd.org>
Date: Thu, 28 Apr 2011 17:40:03 +0000
Subject: Bring back wprintf() for gcc4 libstdc++.

---
 gnu/gcc/libstdc++-v3/include/c_std/std_cwchar.h | 12 +++---------
 gnu/lib/libstdc++-v3/shlib_version              |  2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/gnu/gcc/libstdc++-v3/include/c_std/std_cwchar.h b/gnu/gcc/libstdc++-v3/include/c_std/std_cwchar.h
index 8fb95754dbe..c193f8fcca8 100644
--- a/gnu/gcc/libstdc++-v3/include/c_std/std_cwchar.h
+++ b/gnu/gcc/libstdc++-v3/include/c_std/std_cwchar.h
@@ -151,8 +151,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
   using ::fputwc;
   using ::fputws;
   using ::fwide;
-#if !defined(__OpenBSD__)
   using ::fwprintf;
+#if !defined(__OpenBSD__)
   using ::fwscanf;
 #endif
   using ::getwc;
@@ -163,26 +163,20 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
   using ::mbsrtowcs;
   using ::putwc;
   using ::putwchar;
-#if !defined(__OpenBSD__)
   using ::swprintf;
+#if !defined(__OpenBSD__)
   using ::swscanf;
 #endif
   using ::ungetwc;
-#if !defined(__OpenBSD__)
   using ::vfwprintf;
-#endif
 #if _GLIBCXX_HAVE_VFWSCANF
   using ::vfwscanf;
 #endif
-#if !defined(__OpenBSD__)
   using ::vswprintf;
-#endif
 #if _GLIBCXX_HAVE_VSWSCANF
   using ::vswscanf;
 #endif
-#if !defined(__OpenBSD__)
   using ::vwprintf;
-#endif
 #if _GLIBCXX_HAVE_VWSCANF
   using ::vwscanf;
 #endif
@@ -214,8 +208,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
   using ::wmemcpy;
   using ::wmemmove;
   using ::wmemset;
-#if !defined(__OpenBSD__)
   using ::wprintf;
+#if !defined(__OpenBSD__)
   using ::wscanf;
 #endif
 
diff --git a/gnu/lib/libstdc++-v3/shlib_version b/gnu/lib/libstdc++-v3/shlib_version
index d596e05b27f..664ad72b0a6 100644
--- a/gnu/lib/libstdc++-v3/shlib_version
+++ b/gnu/lib/libstdc++-v3/shlib_version
@@ -1,2 +1,2 @@
-major=50
+major=51
 minor=0
-- 
cgit v1.2.3