Merge pull request #7558 from Faless/fix_windows_output

Fix gibberish output for windows/mingw.
This commit is contained in:
Rémi Verschelde 2017-01-16 19:28:03 +01:00 committed by GitHub
commit 0a9aee6b1d

View file

@ -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);