diff options
| author |   patrick <patrick@openbsd.org> | 2019-02-04 16:55:44 +0000 |
|---|---|---|
| committer | patrick <patrick@openbsd.org> | 2019-02-04 16:55:44 +0000 |
| commit | 76c648e7a477ffb2a882ad5ffe523269bd9a3f6a (patch) | |
| tree | 29d319d598650bab04e4f58e5e8769567e33091e /lib/libcxx/src/typeinfo.cpp | |
| parent | Import libc++abi 7.0.1. (diff) | |
| download | wireguard-openbsd-76c648e7a477ffb2a882ad5ffe523269bd9a3f6a.tar.xz wireguard-openbsd-76c648e7a477ffb2a882ad5ffe523269bd9a3f6a.zip | |
Import libc++ 7.0.1.
Diffstat (limited to 'lib/libcxx/src/typeinfo.cpp')
| -rw-r--r-- | lib/libcxx/src/typeinfo.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/libcxx/src/typeinfo.cpp b/lib/libcxx/src/typeinfo.cpp index 0cb193b77d9..42ff9351ed2 100644 --- a/lib/libcxx/src/typeinfo.cpp +++ b/lib/libcxx/src/typeinfo.cpp @@ -9,7 +9,7 @@ #include "typeinfo" -#if defined(_LIBCPP_ABI_MICROSOFT) +#if defined(_LIBCPP_ABI_MICROSOFT) && defined(_LIBCPP_NO_VCRUNTIME) #include <string.h> int std::type_info::__compare(const type_info &__rhs) const _NOEXCEPT { @@ -49,7 +49,8 @@ size_t std::type_info::hash_code() const _NOEXCEPT { // FIXME: Remove __APPLE__ default here once buildit is gone. // FIXME: Remove the _LIBCPP_BUILDING_HAS_NO_ABI_LIBRARY configuration. #if (!defined(LIBCXX_BUILDING_LIBCXXABI) && !defined(LIBCXXRT) && \ - !defined(__GLIBCXX__) && !defined(__APPLE__)) || \ + !defined(__GLIBCXX__) && !defined(__APPLE__) && \ + !(defined(_LIBCPP_ABI_MICROSOFT) && !defined(_LIBCPP_NO_VCRUNTIME))) || \ defined(_LIBCPP_BUILDING_HAS_NO_ABI_LIBRARY) std::type_info::~type_info() { |