diff options
| author | gpetit <gaspard.petit@eidosmontreal.com> | 2017-08-14 12:42:23 -0400 |
|---|---|---|
| committer | gpetit <gaspard.petit@eidosmontreal.com> | 2017-08-14 12:42:23 -0400 |
| commit | c113a7151d282cd32d246062783c83ccc65feb28 (patch) | |
| tree | 47f2325f8d8115ce9158f1dbef389bdfbcfe7fb0 | |
| parent | aa148eb2b7f70ede0eb10de34b6254826bfb34f4 (diff) | |
| download | googletest-c113a7151d282cd32d246062783c83ccc65feb28.tar.gz googletest-c113a7151d282cd32d246062783c83ccc65feb28.tar.bz2 googletest-c113a7151d282cd32d246062783c83ccc65feb28.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 74ab9490..e1c74733 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 d882ab2e..01041564 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -1663,7 +1663,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[] = ""; |