Back out an old local modification (originating from PR lib/29832)
which effectively disables *wprintf and *wscanf functions in the std namespace. We have wchar support now. (It might be necessary to do a "make clean" in src/gnu/lib/libstdc++-v3_4/include for this to have effect.)
This commit is contained in:
parent
5297b0caca
commit
15efbe0f34
|
@ -79,12 +79,8 @@ namespace std
|
||||||
#undef fputwc
|
#undef fputwc
|
||||||
#undef fputws
|
#undef fputws
|
||||||
#undef fwide
|
#undef fwide
|
||||||
#if _GLIBCXX_HAVE_FWPRINTF
|
#undef fwprintf
|
||||||
# undef fwprintf
|
#undef fwscanf
|
||||||
#endif
|
|
||||||
#if _GLIBCXX_HAVE_FWSCANF
|
|
||||||
# undef fwscanf
|
|
||||||
#endif
|
|
||||||
#undef getwc
|
#undef getwc
|
||||||
#undef getwchar
|
#undef getwchar
|
||||||
#undef mbrlen
|
#undef mbrlen
|
||||||
|
@ -93,16 +89,10 @@ namespace std
|
||||||
#undef mbsrtowcs
|
#undef mbsrtowcs
|
||||||
#undef putwc
|
#undef putwc
|
||||||
#undef putwchar
|
#undef putwchar
|
||||||
#if _GLIBCXX_HAVE_SWPRINTF
|
#undef swprintf
|
||||||
# undef swprintf
|
#undef swscanf
|
||||||
#endif
|
|
||||||
#if _GLIBCXX_HAVE_SWSCANF
|
|
||||||
# undef swscanf
|
|
||||||
#endif
|
|
||||||
#undef ungetwc
|
#undef ungetwc
|
||||||
#if _GLIBCXX_HAVE_VFWPRINTF
|
#undef vfwprintf
|
||||||
# undef vfwprintf
|
|
||||||
#endif
|
|
||||||
#if _GLIBCXX_HAVE_VFWSCANF
|
#if _GLIBCXX_HAVE_VFWSCANF
|
||||||
# undef vfwscanf
|
# undef vfwscanf
|
||||||
#endif
|
#endif
|
||||||
|
@ -110,9 +100,7 @@ namespace std
|
||||||
#if _GLIBCXX_HAVE_VSWSCANF
|
#if _GLIBCXX_HAVE_VSWSCANF
|
||||||
# undef vswscanf
|
# undef vswscanf
|
||||||
#endif
|
#endif
|
||||||
#if _GLIBCXX_HAVE_VWPRINTF
|
#undef vwprintf
|
||||||
# undef vwprintf
|
|
||||||
#endif
|
|
||||||
#if _GLIBCXX_HAVE_VWSCANF
|
#if _GLIBCXX_HAVE_VWSCANF
|
||||||
# undef vwscanf
|
# undef vwscanf
|
||||||
#endif
|
#endif
|
||||||
|
@ -147,12 +135,8 @@ namespace std
|
||||||
#undef wmemcpy
|
#undef wmemcpy
|
||||||
#undef wmemmove
|
#undef wmemmove
|
||||||
#undef wmemset
|
#undef wmemset
|
||||||
#if _GLIBCXX_HAVE_WPRINTF
|
#undef wprintf
|
||||||
# undef wprintf
|
#undef wscanf
|
||||||
#endif
|
|
||||||
#if _GLIBCXX_HAVE_WSCANF
|
|
||||||
# undef wscanf
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if _GLIBCXX_USE_WCHAR_T
|
#if _GLIBCXX_USE_WCHAR_T
|
||||||
namespace std
|
namespace std
|
||||||
|
@ -165,12 +149,8 @@ namespace std
|
||||||
using ::fputwc;
|
using ::fputwc;
|
||||||
using ::fputws;
|
using ::fputws;
|
||||||
using ::fwide;
|
using ::fwide;
|
||||||
#if _GLIBCXX_HAVE_FWPRINTF
|
|
||||||
using ::fwprintf;
|
using ::fwprintf;
|
||||||
#endif
|
|
||||||
#if _GLIBCXX_HAVE_FWSCANF
|
|
||||||
using ::fwscanf;
|
using ::fwscanf;
|
||||||
#endif
|
|
||||||
using ::getwc;
|
using ::getwc;
|
||||||
using ::getwchar;
|
using ::getwchar;
|
||||||
using ::mbrlen;
|
using ::mbrlen;
|
||||||
|
@ -179,28 +159,18 @@ namespace std
|
||||||
using ::mbsrtowcs;
|
using ::mbsrtowcs;
|
||||||
using ::putwc;
|
using ::putwc;
|
||||||
using ::putwchar;
|
using ::putwchar;
|
||||||
#if _GLIBCXX_HAVE_SWPRINTF
|
|
||||||
using ::swprintf;
|
using ::swprintf;
|
||||||
#endif
|
|
||||||
#if _GLIBCXX_HAVE_SWSCANF
|
|
||||||
using ::swscanf;
|
using ::swscanf;
|
||||||
#endif
|
|
||||||
using ::ungetwc;
|
using ::ungetwc;
|
||||||
#if _GLIBCXX_HAVE_VFWPRINTF
|
|
||||||
using ::vfwprintf;
|
using ::vfwprintf;
|
||||||
#endif
|
|
||||||
#if _GLIBCXX_HAVE_VFWSCANF
|
#if _GLIBCXX_HAVE_VFWSCANF
|
||||||
using ::vfwscanf;
|
using ::vfwscanf;
|
||||||
#endif
|
#endif
|
||||||
#if _GLIBCXX_HAVE_VSWPRINTF
|
|
||||||
using ::vswprintf;
|
using ::vswprintf;
|
||||||
#endif
|
|
||||||
#if _GLIBCXX_HAVE_VSWSCANF
|
#if _GLIBCXX_HAVE_VSWSCANF
|
||||||
using ::vswscanf;
|
using ::vswscanf;
|
||||||
#endif
|
#endif
|
||||||
#if _GLIBCXX_HAVE_VWPRINTF
|
|
||||||
using ::vwprintf;
|
using ::vwprintf;
|
||||||
#endif
|
|
||||||
#if _GLIBCXX_HAVE_VWSCANF
|
#if _GLIBCXX_HAVE_VWSCANF
|
||||||
using ::vwscanf;
|
using ::vwscanf;
|
||||||
#endif
|
#endif
|
||||||
|
@ -230,12 +200,8 @@ namespace std
|
||||||
using ::wmemcpy;
|
using ::wmemcpy;
|
||||||
using ::wmemmove;
|
using ::wmemmove;
|
||||||
using ::wmemset;
|
using ::wmemset;
|
||||||
#if _GLIBCXX_HAVE_WPRINTF
|
|
||||||
using ::wprintf;
|
using ::wprintf;
|
||||||
#endif
|
|
||||||
#if _GLIBCXX_HAVE_WSCANF
|
|
||||||
using ::wscanf;
|
using ::wscanf;
|
||||||
#endif
|
|
||||||
|
|
||||||
using ::wcschr;
|
using ::wcschr;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue