Skip to content

GitLab

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

Merge pull request #1377 from davidben/clang-cl 

Also define GTEST_ATTRIBUTE_PRINTF_ in clang-cl.
parents be6ee26a 1acf8c75
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
googletest/include/gtest/internal/gtest-port.h
View file @ abbc0f81
...@@ -879,7 +879,7 @@ using ::std::tuple_size; ...@@ -879,7 +879,7 @@ using ::std::tuple_size;
#endif #endif
// Use this annotation before a function that takes a printf format string. // 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) # if defined(__MINGW_PRINTF_FORMAT)
// MinGW has two different printf implementations. Ensure the format macro // MinGW has two different printf implementations. Ensure the format macro
// matches the selected implementation. See // matches the selected implementation. See
......
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