diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-19 16:59:36 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-19 16:59:36 (GMT) |
| commit | 62ba5d91d0ceff98fbd95294bd94c97017a07f9e (patch) | |
| tree | 38e051e8e4fd2a7b82b95d01b1b63cfc3e2f0251 | |
| parent | 051053054df6d2dbedd5f572ae288f2f82a289b7 (diff) | |
| parent | 1489dc8daad3a9eaff89789752c1cadc5f2ece72 (diff) | |
| download | googletest-62ba5d91d0ceff98fbd95294bd94c97017a07f9e.zip googletest-62ba5d91d0ceff98fbd95294bd94c97017a07f9e.tar.gz googletest-62ba5d91d0ceff98fbd95294bd94c97017a07f9e.tar.bz2 | |
Merge pull request #1401 from eidosmontreal/support_xboxone
Added support for WINAPI_PARTITION_TV_TITLE to support XboxOne applications
| -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 bb20616..02ff07b 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 ccaf99d..723d905 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[] = ""; |