Browse Source

Merge pull request #7558 from Faless/fix_windows_output

Fix gibberish output for windows/mingw.
Rémi Verschelde 8 years ago
parent
commit
0a9aee6b1d
1 changed files with 2 additions and 10 deletions
  1. 2 10
      platform/windows/os_windows.cpp

+ 2 - 10
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);