diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-05 02:59:48 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-05 02:59:48 (GMT) |
| commit | abbc0f8174d92b8a52dd893cf31be6f7af5d0de7 (patch) | |
| tree | f71939f38d18abe7d1969a95be5979e0eea9a8b5 /googletest | |
| parent | be6ee26a9b5b814c3e173c6e5e97c385fbdc1fb0 (diff) | |
| parent | 1acf8c752ee8e20888e5ae887846f034b09c5ca9 (diff) | |
| download | googletest-abbc0f8174d92b8a52dd893cf31be6f7af5d0de7.zip googletest-abbc0f8174d92b8a52dd893cf31be6f7af5d0de7.tar.gz googletest-abbc0f8174d92b8a52dd893cf31be6f7af5d0de7.tar.bz2 | |
Merge pull request #1377 from davidben/clang-cl
Also define GTEST_ATTRIBUTE_PRINTF_ in clang-cl.
Diffstat (limited to 'googletest')
| -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 8778bdd..58ab7fd 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -879,7 +879,7 @@ using ::std::tuple_size; #endif // Use this annotation before a function that takes a printf format string. -#if defined(__GNUC__) && !defined(COMPILER_ICC) +#if (defined(__GNUC__) || defined(__clang__)) && !defined(COMPILER_ICC) # if defined(__MINGW_PRINTF_FORMAT) // MinGW has two different printf implementations. Ensure the format macro // matches the selected implementation. See |