allows snprintf and friends to be in std if we include cstdio.h

API addition -> minor bump.
(part of the strlcpy change okayed by otto@ and friends, that's the
part that requires the bump)

2 files changed, 7 insertions, 7 deletions

diff --git a/gnu/lib/libstdc++/libstdc++/include/c_std/std_cstdio.h b/gnu/lib/libstdc++/libstdc++/include/c_std/std_cstdio.h
index 00378ce4c7f..7b8fc0dad92 100644
--- a/gnu/lib/libstdc++/libstdc++/include/c_std/std_cstdio.h
+++ b/gnu/lib/libstdc++/libstdc++/include/c_std/std_cstdio.h
@@ -142,10 +142,10 @@ namespace std
   using ::vsprintf;
 }
 
-#if defined(_GLIBCPP_USE_C99)
+#if defined(_GLIBCPP_USE_C99) || defined(_GLIBCPP_USE_C99_SNPRINTF)
 
 #undef snprintf
-#undef vfscanf
+//#undef vfscanf
 #undef vscanf
 #undef vsnprintf
 #undef vsscanf
@@ -155,8 +155,8 @@ namespace __gnu_cxx
 #if defined(_GLIBCPP_USE_C99_CHECK) || defined(_GLIBCPP_USE_C99_DYNAMIC)
   extern "C" int
     (snprintf)(char * restrict, size_t, const char * restrict, ...);
-  extern "C" int
-    (vfscanf)(FILE * restrict, const char * restrict, __gnuc_va_list);
+//  extern "C" int
+//   (vfscanf)(FILE * restrict, const char * restrict, __gnuc_va_list);
   extern "C" int (vscanf)(const char * restrict, __gnuc_va_list);
   extern "C" int
     (vsnprintf)(char * restrict, size_t, const char * restrict, __gnuc_va_list);
@@ -165,7 +165,7 @@ namespace __gnu_cxx
 #endif
 #if !defined(_GLIBCPP_USE_C99_DYNAMIC)
   using ::snprintf;
-  using ::vfscanf;
+//using ::vfscanf;
   using ::vscanf;
   using ::vsnprintf;
   using ::vsscanf;
@@ -175,7 +175,7 @@ namespace __gnu_cxx
 namespace std
 {
   using __gnu_cxx::snprintf;
-  using __gnu_cxx::vfscanf;
+//using __gnu_cxx::vfscanf;
   using __gnu_cxx::vscanf;
   using __gnu_cxx::vsnprintf;
   using __gnu_cxx::vsscanf;
diff --git a/gnu/lib/libstdc++/shlib_version b/gnu/lib/libstdc++/shlib_version
index ad7112911fd..33407a566e0 100644
--- a/gnu/lib/libstdc++/shlib_version
+++ b/gnu/lib/libstdc++/shlib_version
@@ -1,2 +1,2 @@
 major=37
-minor=0
+minor=1