Expose wscanf(3) and wcsftime(3) in the std:: namespace (gcc4) and bump major.

4 files changed, 5 insertions, 19 deletions

diff --git a/gnu/gcc/libstdc++-v3/include/c_compatibility/wchar.h b/gnu/gcc/libstdc++-v3/include/c_compatibility/wchar.h
index ca8800374f5..c0b3e01636e 100644
--- a/gnu/gcc/libstdc++-v3/include/c_compatibility/wchar.h
+++ b/gnu/gcc/libstdc++-v3/include/c_compatibility/wchar.h
@@ -45,32 +45,24 @@ using std::fgetws;
 using std::fputwc;
 using std::fputws;
 using std::fwide;
-#if !defined(__OpenBSD__)
 using std::fwprintf;
 using std::fwscanf;
 using std::swprintf;
 using std::swscanf;
 using std::vfwprintf;
-#endif
 #if _GLIBCXX_HAVE_VFWSCANF
 using std::vfwscanf;
 #endif
-#if !defined(__OpenBSD__)
 using std::vswprintf;
-#endif
 #if _GLIBCXX_HAVE_VSWSCANF
 using std::vswscanf;
 #endif
-#if !defined(__OpenBSD__)
 using std::vwprintf;
-#endif
 #if _GLIBCXX_HAVE_VWSCANF
 using std::vwscanf;
 #endif
-#if !defined(__OpenBSD__)
 using std::wprintf;
 using std::wscanf;
-#endif
 using std::getwc;
 using std::getwchar;
 using std::mbsinit;
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 c193f8fcca8..03176bfef77 100644
--- a/gnu/gcc/libstdc++-v3/include/c_std/std_cwchar.h
+++ b/gnu/gcc/libstdc++-v3/include/c_std/std_cwchar.h
@@ -152,9 +152,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
   using ::fputws;
   using ::fwide;
   using ::fwprintf;
-#if !defined(__OpenBSD__)
   using ::fwscanf;
-#endif
   using ::getwc;
   using ::getwchar;
   using ::mbrlen;
@@ -164,9 +162,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
   using ::putwc;
   using ::putwchar;
   using ::swprintf;
-#if !defined(__OpenBSD__)
   using ::swscanf;
-#endif
   using ::ungetwc;
   using ::vfwprintf;
 #if _GLIBCXX_HAVE_VFWSCANF
@@ -209,9 +205,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
   using ::wmemmove;
   using ::wmemset;
   using ::wprintf;
-#if !defined(__OpenBSD__)
   using ::wscanf;
-#endif
 
   using ::wcschr;
 
diff --git a/gnu/lib/libstdc++-v3/config.h b/gnu/lib/libstdc++-v3/config.h
index 1a3abc0d9a1..4778e33410f 100644
--- a/gnu/lib/libstdc++-v3/config.h
+++ b/gnu/lib/libstdc++-v3/config.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.h,v 1.2 2010/05/09 09:46:26 kettenis Exp $ */
+/* $OpenBSD: config.h,v 1.3 2011/10/16 13:24:53 stsp Exp $ */
 /* config.h.  Generated by configure.  */
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
@@ -382,13 +382,13 @@
 #define HAVE_UNISTD_H 1
 
 /* Defined if vfwscanf exists. */
-/* #undef HAVE_VFWSCANF */
+#define HAVE_VFWSCANF 1
 
 /* Defined if vswscanf exists. */
-/* #undef HAVE_VSWSCANF */
+#define HAVE_VSWSCANF 1
 
 /* Defined if vwscanf exists. */
-/* #undef HAVE_VWSCANF */
+#define HAVE_VWSCANF 1
 
 /* Define to 1 if you have the <wchar.h> header file. */
 #define HAVE_WCHAR_H 1
diff --git a/gnu/lib/libstdc++-v3/shlib_version b/gnu/lib/libstdc++-v3/shlib_version
index 5bbc5cae3e1..cee16a5a3fd 100644
--- a/gnu/lib/libstdc++-v3/shlib_version
+++ b/gnu/lib/libstdc++-v3/shlib_version
@@ -1,2 +1,2 @@
-major=52
+major=53
 minor=0