From 579faaab5f1868ada0e1444e884ec4271a05289d Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Sat, 13 Nov 2010 17:00:20 +0100 Subject: [PATCH] Convert MONO_MARSHAL_CONV_LPSTR_STR to mono_string_to_utf16 on windows. --- mono/metadata/marshal.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mono/metadata/marshal.c b/mono/metadata/marshal.c index ec3be7090db..956f232088b 100644 --- a/mono/metadata/marshal.c +++ b/mono/metadata/marshal.c @@ -1413,7 +1413,11 @@ conv_to_icall (MonoMarshalConv conv) case MONO_MARSHAL_CONV_LPWSTR_STR: return mono_string_from_utf16; case MONO_MARSHAL_CONV_LPSTR_STR: +#ifdef TARGET_WIN32 + return mono_string_from_utf16; +#else return mono_string_new_wrapper; +#endif case MONO_MARSHAL_CONV_STR_LPTSTR: #ifdef TARGET_WIN32 return mono_marshal_string_to_utf16; -- 2.25.1