diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-24 12:07:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-24 12:07:16 -0500 |
| commit | ab9c44ccf0f73eff9cdcfdcca14ebaa6d83d8062 (patch) | |
| tree | 11aae3d32d657c9bb36f1685c0db41fd5a7e4117 | |
| parent | 3c5e064ca089cbe3e89278e16c2c6cc3a97dba1f (diff) | |
| parent | ad0146bfe21eca5e7c657bdb19b92e7982e04157 (diff) | |
| download | googletest-ab9c44ccf0f73eff9cdcfdcca14ebaa6d83d8062.tar.gz googletest-ab9c44ccf0f73eff9cdcfdcca14ebaa6d83d8062.tar.bz2 googletest-ab9c44ccf0f73eff9cdcfdcca14ebaa6d83d8062.zip | |
Merge pull request #1410 from pcc/win-libcxx
Check whether _MSC_VER is defined when detecting presence of cxxabi.h…
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index 58ab7fdf..01ad5dac 100644 --- 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 |