diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2015-09-16 22:26:52 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2015-09-16 22:26:52 +0000 |
commit | 854fa44b6f7a32ff94c2a705691da6d3b703574a (patch) | |
tree | aaccdba1a8c990ea730287a164e76e70733b424a /contrib/libc++/include/cwchar | |
parent | 0e1e5c22c20e636264ff1284083c6af7a1b282cb (diff) | |
parent | 61b9a7258a7693d7f3674a5a1daf7b036ff1d382 (diff) | |
download | src-854fa44b6f7a32ff94c2a705691da6d3b703574a.tar.gz src-854fa44b6f7a32ff94c2a705691da6d3b703574a.zip |
Update libc++ to 3.7.0 release.
Notes
Notes:
svn path=/projects/clang370-import/; revision=287877
Diffstat (limited to 'contrib/libc++/include/cwchar')
-rw-r--r-- | contrib/libc++/include/cwchar | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/contrib/libc++/include/cwchar b/contrib/libc++/include/cwchar index 9f51587caa5f..797a1777c22f 100644 --- a/contrib/libc++/include/cwchar +++ b/contrib/libc++/include/cwchar @@ -126,24 +126,18 @@ using ::fwscanf; using ::swprintf; using ::vfwprintf; using ::vswprintf; -using ::vwprintf; #ifndef _LIBCPP_MSVCRT using ::swscanf; using ::vfwscanf; using ::vswscanf; -using ::vwscanf; #endif // _LIBCPP_MSVCRT -using ::wprintf; -using ::wscanf; using ::fgetwc; using ::fgetws; using ::fputwc; using ::fputws; using ::fwide; using ::getwc; -using ::getwchar; using ::putwc; -using ::putwchar; using ::ungetwc; using ::wcstod; #ifndef _LIBCPP_MSVCRT @@ -212,6 +206,20 @@ using ::wcrtomb; using ::mbsrtowcs; using ::wcsrtombs; +#ifndef _LIBCPP_HAS_NO_STDIN +using ::getwchar; +#ifndef _LIBCPP_MSVCRT +using ::vwscanf; +#endif // _LIBCPP_MSVCRT +using ::wscanf; +#endif + +#ifndef _LIBCPP_HAS_NO_STDOUT +using ::putwchar; +using ::vwprintf; +using ::wprintf; +#endif + _LIBCPP_END_NAMESPACE_STD #endif // _LIBCPP_CWCHAR |