diff options
| author | Hugo Lindström <hugo.lindstrom@trimble.se> | 2019-01-25 14:23:53 +0100 |
|---|---|---|
| committer | Hugo Lindström <hugo.lindstrom@trimble.se> | 2019-01-25 14:23:53 +0100 |
| commit | aea0d17e85d4c8884a626348c589de9b91fca865 (patch) | |
| tree | 4bd73edcb54825765c50841ef858a59e44309342 | |
| parent | 542e057c6c5bf45454b43764b881397b71164d62 (diff) | |
| parent | d2b89946f80a5d5a2b5055c20549e8327de7605c (diff) | |
| download | googletest-aea0d17e85d4c8884a626348c589de9b91fca865.zip googletest-aea0d17e85d4c8884a626348c589de9b91fca865.tar.gz googletest-aea0d17e85d4c8884a626348c589de9b91fca865.tar.bz2 | |
Merge branch 'fix-compile-on-wec2013' into v1.8.x
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 13 |
1 files changed, 11 insertions, 2 deletions
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 |