diff options
| author | gpetit <gaspard.petit@eidosmontreal.com> | 2017-08-14 12:42:23 -0400 |
|---|---|---|
| committer | Gaspard Petit <gaspard.petit@eidosmontreal.com> | 2018-01-12 10:20:26 -0500 |
| commit | 33d73d42b42ac104db99ad021f018db681022bd8 (patch) | |
| tree | 39851f351f4c5c2e4a61422e975af12c92fc9158 | |
| parent | ed8d02cfc689f26b65e6deb585561c59615b05de (diff) | |
| download | googletest-33d73d42b42ac104db99ad021f018db681022bd8.tar.gz googletest-33d73d42b42ac104db99ad021f018db681022bd8.tar.bz2 googletest-33d73d42b42ac104db99ad021f018db681022bd8.zip | |
Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port-arch.h | 3 | ||||
| -rw-r--r-- | googletest/src/gtest.cc | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/googletest/include/gtest/internal/gtest-port-arch.h b/googletest/include/gtest/internal/gtest-port-arch.h index bb206167..02ff07b4 100644 --- a/googletest/include/gtest/internal/gtest-port-arch.h +++ b/googletest/include/gtest/internal/gtest-port-arch.h @@ -54,6 +54,9 @@ # define GTEST_OS_WINDOWS_PHONE 1 # elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) # define GTEST_OS_WINDOWS_RT 1 +# elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_TV_TITLE) +# define GTEST_OS_WINDOWS_PHONE 1 +# define GTEST_OS_WINDOWS_TV_TITLE 1 # else // WINAPI_FAMILY defined but no known partition matched. // Default to desktop. diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 0aeeb8e7..407241c8 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -1655,7 +1655,7 @@ namespace { AssertionResult HRESULTFailureHelper(const char* expr, const char* expected, long hr) { // NOLINT -# if GTEST_OS_WINDOWS_MOBILE +# if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_TV_TITLE // Windows CE doesn't support FormatMessage. const char error_text[] = ""; |