diff options
| author | Mark Barolak <mbar@google.com> | 2020-06-26 16:03:15 (GMT) |
|---|---|---|
| committer | Mark Barolak <mbar@google.com> | 2020-06-26 16:03:15 (GMT) |
| commit | 62f388e15fb0a3ece2506096e30b4ec8fb861020 (patch) | |
| tree | 2ea6f540125d8de509231082628b66129b02136c | |
| parent | c6e309b268d4fb9138bed7d0f56b7709c29f102f (diff) | |
| parent | 1eda5d825a30eaf5cd50aa4230ea8e9fec613e17 (diff) | |
| download | googletest-62f388e15fb0a3ece2506096e30b4ec8fb861020.zip googletest-62f388e15fb0a3ece2506096e30b4ec8fb861020.tar.gz googletest-62f388e15fb0a3ece2506096e30b4ec8fb861020.tar.bz2 | |
Merge pull request #2891 from zoddicus:fixMinGW
PiperOrigin-RevId: 317666280
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index d5eea8e..6b66362 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -2055,15 +2055,15 @@ GTEST_DISABLE_MSC_DEPRECATED_PUSH_() inline int ChDir(const char* dir) { return chdir(dir); } #endif inline FILE* FOpen(const char* path, const char* mode) { -#if GTEST_OS_WINDOWS +#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW struct wchar_codecvt : public std::codecvt<wchar_t, char, std::mbstate_t> {}; std::wstring_convert<wchar_codecvt> converter; std::wstring wide_path = converter.from_bytes(path); std::wstring wide_mode = converter.from_bytes(mode); return _wfopen(wide_path.c_str(), wide_mode.c_str()); -#else +#else // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW return fopen(path, mode); -#endif // GTEST_OS_WINDOWS +#endif // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW } #if !GTEST_OS_WINDOWS_MOBILE inline FILE *FReopen(const char* path, const char* mode, FILE* stream) { |