Skip to content

GitLab

Unverified Commit ab9c44cc authored by Gennadiy Civil's avatar Gennadiy Civil Committed by GitHub
Browse files

Merge pull request #1410 from pcc/win-libcxx 

Check whether _MSC_VER is defined when detecting presence of cxxabi.h…
parents 3c5e064c ad0146bf
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
googletest/include/gtest/internal/gtest-port.h
View file @ ab9c44cc
...@@ -980,7 +980,7 @@ using ::std::tuple_size; ...@@ -980,7 +980,7 @@ using ::std::tuple_size;
#endif #endif
// _LIBCPP_VERSION is defined by the libc++ library from the LLVM project. // _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 # define GTEST_HAS_CXXABI_H_ 1
#else #else
# define GTEST_HAS_CXXABI_H_ 0 # define GTEST_HAS_CXXABI_H_ 0
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment