Convert MONO_MARSHAL_CONV_LPSTR_STR to mono_string_to_utf16 on windows.

diff --git a/mono/metadata/marshal.c b/mono/metadata/marshal.c
index ec3be7090dbfcf5fb31aaf35240e4a691273a9ab..956f232088b8dbfb492c570ae4515bdad5c9753b 100644 (file)
--- 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;