summaryrefslogtreecommitdiffstats
path: root/googletest/include
diff options
context:
space:
mode:
authorGaspard Petit <gpetit@eidosmontreal.com>2022-05-30 17:34:17 (GMT)
committerGaspard Petit <gpetit@eidosmontreal.com>2022-05-30 18:19:50 (GMT)
commit59006287cd4f8c239eaa0f23852eef2b57d93da3 (patch)
tree79163441763efa521c82ad1729346f2f101fd51e /googletest/include
parent9d21db9e0a60a1ea61ec19331c9bc0dd33e907b1 (diff)
downloadgoogletest-59006287cd4f8c239eaa0f23852eef2b57d93da3.zip
googletest-59006287cd4f8c239eaa0f23852eef2b57d93da3.tar.gz
googletest-59006287cd4f8c239eaa0f23852eef2b57d93da3.tar.bz2
Simplify ColoredPrintf to rely on ShouldUseColor
Use ShouldUseColor to set use_color instead of having a separate check for the windows mobile cases; these cases are now moved directly to `DoIsATTY`
Diffstat (limited to 'googletest/include')
-rw-r--r--googletest/include/gtest/internal/gtest-port.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h
index 7162e6e..e52d8a7 100644
--- a/googletest/include/gtest/internal/gtest-port.h
+++ b/googletest/include/gtest/internal/gtest-port.h
@@ -1965,7 +1965,8 @@ inline int StrCaseCmp(const char* s1, const char* s2) {
}
inline char* StrDup(const char* src) { return strdup(src); }
#else // !__BORLANDC__
-#if GTEST_OS_WINDOWS_MOBILE
+#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_ZOS || GTEST_OS_IOS || \
+ GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT || defined(ESP_PLATFORM)
inline int DoIsATTY(int /* fd */) { return 0; }
#else
inline int DoIsATTY(int fd) { return _isatty(fd); }