summaryrefslogtreecommitdiffstats
path: root/libcxx/include/cstdlib
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2011-10-22 20:59:45 +0000
committerHoward Hinnant <hhinnant@apple.com>2011-10-22 20:59:45 +0000
commite4383379aea7783e11f2229f27fa81b52751e4f4 (patch)
tree4f369dabb74c0a9b6d1059d801b4e41607e2157d /libcxx/include/cstdlib
parenta6674c7fc965ef39b97d2faf518587e02cc23d56 (diff)
downloadbcm5719-llvm-e4383379aea7783e11f2229f27fa81b52751e4f4.tar.gz
bcm5719-llvm-e4383379aea7783e11f2229f27fa81b52751e4f4.zip
More windows port work by Ruben Van Boxem
llvm-svn: 142732
Diffstat (limited to 'libcxx/include/cstdlib')
-rw-r--r--libcxx/include/cstdlib5
1 files changed, 5 insertions, 0 deletions
diff --git a/libcxx/include/cstdlib b/libcxx/include/cstdlib
index e8726cf6fce..01b13a8dc04 100644
--- a/libcxx/include/cstdlib
+++ b/libcxx/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
OpenPOWER on IntegriCloud