diff options
| author | Matthieu Longo <mateo.longo@gmail.com> | 2018-09-17 16:17:10 (GMT) |
|---|---|---|
| committer | Matthieu Longo <matthieu.longo@murex.com> | 2018-09-18 16:29:42 (GMT) |
| commit | c9fe337ae255baac2c72b4a1099bbad4e181a3a8 (patch) | |
| tree | b3053073868cd21a3bb4f47914973a845f827924 /googletest/include/gtest/internal | |
| parent | bc2d0935b74917be0821bfd834472ed9cc4a3b5b (diff) | |
| download | googletest-c9fe337ae255baac2c72b4a1099bbad4e181a3a8.zip googletest-c9fe337ae255baac2c72b4a1099bbad4e181a3a8.tar.gz googletest-c9fe337ae255baac2c72b4a1099bbad4e181a3a8.tar.bz2 | |
[msys] fix unittest ColoredOutputTest.UsesColorsWhenTermSupportsColorsrefs/pull/1843/head
Diffstat (limited to 'googletest/include/gtest/internal')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port-arch.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/googletest/include/gtest/internal/gtest-port-arch.h b/googletest/include/gtest/internal/gtest-port-arch.h index f83700e..587ed5e 100644 --- a/googletest/include/gtest/internal/gtest-port-arch.h +++ b/googletest/include/gtest/internal/gtest-port-arch.h @@ -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) |