diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2011-10-22 20:59:45 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2011-10-22 20:59:45 +0000 |
| commit | 78b6828f1420a266e02687685bc2ab993a54eadd (patch) | |
| tree | 7a4347733e3f72a22e656337356307652ab967e3 /include/cstdlib | |
| parent | f46fc939cbcb2e2287575fd19b4ee01430591229 (diff) | |
| download | external_libcxx-78b6828f1420a266e02687685bc2ab993a54eadd.tar.gz external_libcxx-78b6828f1420a266e02687685bc2ab993a54eadd.tar.bz2 external_libcxx-78b6828f1420a266e02687685bc2ab993a54eadd.zip | |
More windows port work by Ruben Van Boxem
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@142732 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/cstdlib')
| -rw-r--r-- | include/cstdlib | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/cstdlib b/include/cstdlib index e8726cf6f..01b13a8dc 100644 --- a/include/cstdlib +++ b/include/cstdlib @@ -81,6 +81,9 @@ size_t wcstombs(char* restrict s, const wchar_t* restrict pwcs, size_t n); #include <__config> #include <stdlib.h> +#ifdef _MSC_VER +#include "support/win32/support.h" +#endif // _MSC_VER #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header @@ -129,11 +132,13 @@ using ::wctomb; using ::mbstowcs; using ::wcstombs; +#ifndef _MSC_VER // MSVC already has the correct prototype in <stdlib.h.h> #ifdef __cplusplus inline _LIBCPP_INLINE_VISIBILITY long abs( long __x) {return labs(__x);} inline _LIBCPP_INLINE_VISIBILITY long long abs(long long __x) {return llabs(__x);} inline _LIBCPP_INLINE_VISIBILITY ldiv_t div( long __x, long __y) {return ldiv(__x, __y);} inline _LIBCPP_INLINE_VISIBILITY lldiv_t div(long long __x, long long __y) {return lldiv(__x, __y);} +#endif // _MSC_VER _LIBCPP_END_NAMESPACE_STD |
