Merge pull request #1410 from pcc/win-libcxx

Check whether _MSC_VER is defined when detecting presence of cxxabi.h…
This commit is contained in:
Gennadiy Civil 2018-01-24 12:07:16 -05:00 committed by GitHub
commit ab9c44ccf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -980,7 +980,7 @@ using ::std::tuple_size;
#endif
// _LIBCPP_VERSION is defined by the libc++ library from the LLVM project.
#if defined(__GLIBCXX__) || defined(_LIBCPP_VERSION)
#if defined(__GLIBCXX__) || (defined(_LIBCPP_VERSION) && !defined(_MSC_VER))
# define GTEST_HAS_CXXABI_H_ 1
#else
# define GTEST_HAS_CXXABI_H_ 0