Merge pull request #1410 from pcc/win-libcxx

Check whether _MSC_VER is defined when detecting presence of cxxabi.h…

Merge pull request #1410 from pcc/win-libcxx
ab9c44cc · Gennadiy Civil · GitHub · 3c5e064c · ad0146bf · ab9c44cc
Unverified Commit ab9c44cc authored Jan 24, 2018 by Gennadiy Civil Committed by GitHub Jan 24, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

gtest-port.h googletest/include/gtest/internal/gtest-port.h +1 -1

No files found.
--- a/googletest/include/gtest/internal/gtest-port.h
+++ b/googletest/include/gtest/internal/gtest-port.h
@@ -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