X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fgettext.h;h=81510aed6578ccf58813787dd0fa5ff087c7da2d;hb=18bfa1c785a123499ee12d0551a9447a4d32d93b;hp=862274a31d20542a2b88241d28a36f3b9f399721;hpb=22a59b3912ff5e7bb1516faa06f1841545a8117c;p=oweals%2Fminetest.git

diff --git a/src/gettext.h b/src/gettext.h
index 862274a31..81510aed6 100644
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -48,6 +48,10 @@ void init_gettext(const char *path,std::string configured_language,int argc, cha
 void init_gettext(const char *path,std::string configured_language);
 #endif
 
+extern std::wstring narrow_to_wide(const std::string& mbs);
+#include "util/numeric.h"
+
+
 /******************************************************************************/
 inline wchar_t* chartowchar_t(const char *str)
 {
@@ -56,7 +60,7 @@ inline wchar_t* chartowchar_t(const char *str)
 	int nResult = MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) str, -1, 0, 0 );
 	if( nResult == 0 )
 	{
-		fprintf( stderr, "error: MultiByteToWideChar returned null\n" );
+		errorstream<<"gettext: MultiByteToWideChar returned null"<<std::endl;
 	}
 	else
 	{
@@ -64,9 +68,12 @@ inline wchar_t* chartowchar_t(const char *str)
 		MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) str, -1, (WCHAR *) nstr, nResult );
 	}
 #else
-	size_t l = strlen(str)+1;
-	nstr = new wchar_t[l];
-	mbstowcs(nstr, str, l);
+	size_t l = strlen(str);
+	nstr = new wchar_t[l+1];
+
+	std::wstring intermediate = narrow_to_wide(str);
+	memset(nstr, 0, (l+1)*sizeof(wchar_t));
+	memcpy(nstr, intermediate.c_str(), l*sizeof(wchar_t));
 #endif
 
 	return nstr;