google/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-12-11 09:52:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1843 from matlo607/fix-unittest-msys-ColoredOutputTest

Browse Source 
[msys] fix unittest ColoredOutputTest.UsesColorsWhenTermSupportsColors
This commit is contained in:
Gennadiy Civil
2018-09-20 11:42:29 -04:00
committed by GitHub
parent 09560fba44 c9fe337ae2
commit 8bf297233f
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
googletest/include/gtest/internal/gtest-port-arch.h
View File

@@ -38,14 +38,15 @@
// Determines the platform on which Google Test is compiled.
#ifdef __CYGWIN__
# define GTEST_OS_CYGWIN 1
# elif defined(__MINGW__) || defined(__MINGW32__) || defined(__MINGW64__)
# define GTEST_OS_WINDOWS_MINGW 1
# define GTEST_OS_WINDOWS 1
#elif defined __SYMBIAN32__
# define GTEST_OS_SYMBIAN 1
#elif defined _WIN32
# define GTEST_OS_WINDOWS 1
# ifdef _WIN32_WCE
# define GTEST_OS_WINDOWS_MOBILE 1
# elif defined(__MINGW__) || defined(__MINGW32__)
# define GTEST_OS_WINDOWS_MINGW 1
# elif defined(WINAPI_FAMILY)
# include <winapifamily.h>
# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)