aboutsummaryrefslogtreecommitdiff
path: root/include/support
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2017-01-09 21:23:41 +0000
committerDimitry Andric <dim@FreeBSD.org>2017-01-09 21:23:41 +0000
commit78da6db1f23c0bfe8a36a5b5c05d06005037e556 (patch)
tree313656e2b2326f4a83a68f108956d0551c751600 /include/support
parent4a2db4d30e1653093d4d8b06e8221e2f8b723507 (diff)
downloadsrc-78da6db1f23c0bfe8a36a5b5c05d06005037e556.tar.gz
src-78da6db1f23c0bfe8a36a5b5c05d06005037e556.zip
Vendor import of libc++ trunk r291476:vendor/libc++/libc++-trunk-r291476
Notes
Notes: svn path=/vendor/libc++/dist/; revision=311824 svn path=/vendor/libc++/libc++-trunk-r291476/; revision=311825; tag=vendor/libc++/libc++-trunk-r291476
Diffstat (limited to 'include/support')
-rw-r--r--include/support/win32/support.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/support/win32/support.h b/include/support/win32/support.h
index 17ee1980a643..f9613445cffb 100644
--- a/include/support/win32/support.h
+++ b/include/support/win32/support.h
@@ -18,7 +18,7 @@
#include <cstdarg> // va_ macros
// "builtins" not implemented here for Clang or GCC as they provide
// implementations. Assuming required for elsewhere else, certainly MSVC.
-#if defined(_LIBCPP_MSVC)
+#if defined(_LIBCPP_COMPILER_MSVC)
#include <intrin.h>
#endif
#if defined(_LIBCPP_MSVCRT)
@@ -49,7 +49,7 @@ size_t wcsnrtombs(char *__restrict dst, const wchar_t **__restrict src,
#define _Exit _exit
#endif
-#if defined(_LIBCPP_MSVC)
+#if defined(_LIBCPP_COMPILER_MSVC)
// Bit builtin's make these assumptions when calling _BitScanForward/Reverse
// etc. These assumptions are expected to be true for Win32/Win64 which this