diff options
| author | James Gregory <james@james.id.au> | 2013-08-19 14:01:32 -0700 |
|---|---|---|
| committer | James Gregory <james@james.id.au> | 2013-08-19 14:01:32 -0700 |
| commit | afcdfff09f8557ce6810546628733f48d6c45408 (patch) | |
| tree | 9c556c29a0556429dc1b421b2d5abade1915a034 /system/include/libcxx/cstdlib | |
| parent | 46c82708d50e839945fa24094fe352241be6a22e (diff) | |
| parent | cd38275faf739ba151c0aa7abe13703c9b8d8235 (diff) | |
Merge remote-tracking branch 'origin/incoming' into touch_handling
Diffstat (limited to 'system/include/libcxx/cstdlib')
| -rw-r--r-- | system/include/libcxx/cstdlib | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/system/include/libcxx/cstdlib b/system/include/libcxx/cstdlib index 95e38428..0a96fb0a 100644 --- a/system/include/libcxx/cstdlib +++ b/system/include/libcxx/cstdlib @@ -84,9 +84,9 @@ void *aligned_alloc(size_t alignment, size_t size); // C11 #include <__config> #include <stdlib.h> -#ifdef _MSC_VER +#ifdef _LIBCPP_MSVCRT #include "support/win32/locale_win32.h" -#endif // _MSC_VER +#endif // _LIBCPP_MSVCRT #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header @@ -154,8 +154,8 @@ using ::quick_exit; using ::aligned_alloc; #endif -// MSVC already has the correct prototype in <stdlib.h.h> #ifdef __cplusplus -#if !defined(_MSC_VER) && !defined(__sun__) +// MSVCRT already has the correct prototype in <stdlib.h> #ifdef __cplusplus +#if !defined(_LIBCPP_MSVCRT) && !defined(__sun__) inline _LIBCPP_INLINE_VISIBILITY long abs( long __x) _NOEXCEPT {return labs(__x);} #ifndef _LIBCPP_HAS_NO_LONG_LONG inline _LIBCPP_INLINE_VISIBILITY long long abs(long long __x) _NOEXCEPT {return llabs(__x);} @@ -165,7 +165,7 @@ inline _LIBCPP_INLINE_VISIBILITY ldiv_t div( long __x, long __y) _NOEX #ifndef _LIBCPP_HAS_NO_LONG_LONG inline _LIBCPP_INLINE_VISIBILITY lldiv_t div(long long __x, long long __y) _NOEXCEPT {return lldiv(__x, __y);} #endif // _LIBCPP_HAS_NO_LONG_LONG -#endif // _MSC_VER +#endif // _LIBCPP_MSVCRT _LIBCPP_END_NAMESPACE_STD |