diff options
| author | Stefan Sperling <stsp@cvs.openbsd.org> | 2011-04-24 08:38:55 +0000 |
|---|---|---|
| committer | Stefan Sperling <stsp@cvs.openbsd.org> | 2011-04-24 08:38:55 +0000 |
| commit | 80cf522be022df20b49026ae68240e744813d2d2 (patch) | |
| tree | 1fd0bc53fb9f4d729237c5182f55b4fd4da865ac /gnu | |
| parent | db844adcc90ca1a78c9eb5f22f637dc156c70bae (diff) | |
Back out wprintf diff and crank. Need to check more architectures first.
requested by and ok deraadt
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/gcc/libstdc++-v3/include/c_std/std_cwchar.h | 12 | ||||
| -rw-r--r-- | gnu/lib/libstdc++-v3/shlib_version | 2 |
2 files changed, 10 insertions, 4 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 c193f8fcca8..8fb95754dbe 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; - using ::fwprintf; #if !defined(__OpenBSD__) + using ::fwprintf; using ::fwscanf; #endif using ::getwc; @@ -163,20 +163,26 @@ _GLIBCXX_BEGIN_NAMESPACE(std) using ::mbsrtowcs; using ::putwc; using ::putwchar; - using ::swprintf; #if !defined(__OpenBSD__) + using ::swprintf; 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 @@ -208,8 +214,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) using ::wmemcpy; using ::wmemmove; using ::wmemset; - using ::wprintf; #if !defined(__OpenBSD__) + using ::wprintf; using ::wscanf; #endif diff --git a/gnu/lib/libstdc++-v3/shlib_version b/gnu/lib/libstdc++-v3/shlib_version index 664ad72b0a6..d596e05b27f 100644 --- a/gnu/lib/libstdc++-v3/shlib_version +++ b/gnu/lib/libstdc++-v3/shlib_version @@ -1,2 +1,2 @@ -major=51 +major=50 minor=0 |