diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-16 19:28:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-16 19:28:03 +0100 |
| commit | 0a9aee6b1d20f29e0e7a3bc8990f807144b62f74 (patch) | |
| tree | d076aa228275cc5fc882caf3c7242bec37d78729 | |
| parent | 7b059965e8df745c5b45b4ec6bfbdfe1a7397642 (diff) | |
| parent | 3df934acadeadaf7b2f2920411016dcb3bde7d99 (diff) | |
Merge pull request #7558 from Faless/fix_windows_output
Fix gibberish output for windows/mingw.
| -rw-r--r-- | platform/windows/os_windows.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 6439de67a6..d1d769adf7 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -1300,18 +1300,10 @@ void OS_Windows::vprint(const char* p_format, va_list p_list, bool p_stderr) { MultiByteToWideChar(CP_UTF8,0,buf,len,wbuf,wlen); wbuf[wlen]=0; -// Recent MinGW and MSVC compilers seem to disagree on the case here -#ifdef __MINGW32__ if (p_stderr) - fwprintf(stderr, L"%S", wbuf); + fwprintf(stderr, L"%ls", wbuf); else - wprintf(L"%S", wbuf); -#else // MSVC - if (p_stderr) - fwprintf(stderr, L"%s", wbuf); - else - wprintf(L"%s", wbuf); -#endif + wprintf(L"%ls", wbuf); #ifdef STDOUT_FILE //vwfprintf(stdo,p_format,p_list); |