diff options
Diffstat (limited to 'libcxx/src')
| -rw-r--r-- | libcxx/src/string.cpp | 5 | ||||
| -rw-r--r-- | libcxx/src/support/runtime/exception_pointer_msvc.ipp | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/libcxx/src/string.cpp b/libcxx/src/string.cpp index cd644330b3a..d7ebdd3e5c9 100644 --- a/libcxx/src/string.cpp +++ b/libcxx/src/string.cpp @@ -13,9 +13,6 @@ #include "cerrno" #include "limits" #include "stdexcept" -#ifdef _LIBCPP_MSVCRT -#include "support/win32/support.h" -#endif // _LIBCPP_MSVCRT #include <stdio.h> _LIBCPP_BEGIN_NAMESPACE_STD @@ -430,7 +427,7 @@ get_swprintf() #ifndef _LIBCPP_MSVCRT return swprintf; #else - return static_cast<int (__cdecl*)(wchar_t* __restrict, size_t, const wchar_t*__restrict, ...)>(swprintf); + return static_cast<int (__cdecl*)(wchar_t* __restrict, size_t, const wchar_t*__restrict, ...)>(_snwprintf); #endif } diff --git a/libcxx/src/support/runtime/exception_pointer_msvc.ipp b/libcxx/src/support/runtime/exception_pointer_msvc.ipp index a8cd0e8d304..eab5d30a948 100644 --- a/libcxx/src/support/runtime/exception_pointer_msvc.ipp +++ b/libcxx/src/support/runtime/exception_pointer_msvc.ipp @@ -10,6 +10,7 @@ #include <stdio.h> #include <stdlib.h> +#include <yvals.h> // for _CRTIMP2_PURE _CRTIMP2_PURE void __CLRCALL_PURE_OR_CDECL __ExceptionPtrCreate(_Out_ void*); _CRTIMP2_PURE void __CLRCALL_PURE_OR_CDECL __ExceptionPtrDestroy(_Inout_ void*); |
