diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2019-01-30 04:37:58 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-30 04:37:58 (GMT) |
| commit | dea0216d0c6bc5e63cf5f6c8651cd268668032ec (patch) | |
| tree | 7d2cefd5800907e2143cab10e57078e920356a32 | |
| parent | 4fe76c4d6e667ba588a3868d052a2aa4b423afa3 (diff) | |
| parent | aafc594a43f1fecbee66edd8d328b30c23aeeaf8 (diff) | |
| download | googletest-dea0216d0c6bc5e63cf5f6c8651cd268668032ec.zip googletest-dea0216d0c6bc5e63cf5f6c8651cd268668032ec.tar.gz googletest-dea0216d0c6bc5e63cf5f6c8651cd268668032ec.tar.bz2 | |
Merge pull request #2083 from hugolm84/v1.8.xrefs/pull/4095/headrefs/pull/1871/headv1.8.x
Add missing typedefs for WINCE800 (Windows Embedded Compact 2013)
| -rw-r--r-- | googletest/cmake/internal_utils.cmake | 2 | ||||
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake index 8c1f9ba..ae32b62 100644 --- a/googletest/cmake/internal_utils.cmake +++ b/googletest/cmake/internal_utils.cmake @@ -22,6 +22,8 @@ macro(fix_default_compiler_settings_) # This replacement code is taken from sample in the CMake Wiki at # https://gitlab.kitware.com/cmake/community/wikis/FAQ#dynamic-replace. foreach (flag_var + CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE + CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO) if (NOT BUILD_SHARED_LIBS AND NOT gtest_force_shared_crt) diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index 786497d..49d3f75 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -271,7 +271,14 @@ #ifndef _WIN32_WCE # include <sys/types.h> # include <sys/stat.h> -#endif // !_WIN32_WCE +#elif _WIN32_WCE >= 0x800 // Windows Embedded Compact 2013 +// Forward declare instead of including <windows.h> / <windef.h> / <winnt.h> +typedef wchar_t WCHAR; +typedef WCHAR *PWCHAR, *LPWCH, *PWCH; +typedef const WCHAR *LPCWCH, *PCWCH; +typedef __readableTo(sentinel(0)) const WCHAR *LPCWSTR, *PCWSTR; +typedef const WCHAR *LPCWCHAR, *PCWCHAR; +#endif #if defined __APPLE__ # include <AvailabilityMacros.h> @@ -430,6 +437,8 @@ // MinGW defined _CRITICAL_SECTION and _RTL_CRITICAL_SECTION as two // separate (equivalent) structs, instead of using typedef typedef struct _CRITICAL_SECTION GTEST_CRITICAL_SECTION; +#elif _WIN32_WCE >= 0x800 +typedef struct CRITICAL_SECTION GTEST_CRITICAL_SECTION; #else // Assume CRITICAL_SECTION is a typedef of _RTL_CRITICAL_SECTION. // This assumption is verified by @@ -2468,7 +2477,7 @@ inline char* StrDup(const char* src) { return _strdup(src); } # endif // __BORLANDC__ # if GTEST_OS_WINDOWS_MOBILE -inline int FileNo(FILE* file) { return reinterpret_cast<int>(_fileno(file)); } +inline int FileNo(FILE* file) { return static_cast<int>(_fileno(file)); } // Stat(), RmDir(), and IsDir() are not needed on Windows CE at this // time and thus not defined there. # else |