Fixed an ANSI to managed string conversion bug on native to managed callback functions.

diff --git a/mono/metadata/marshal.c b/mono/metadata/marshal.c
index 971f9c52ce233ac835e213fad59cddc9d99cc91b..e4405061ba577a713e016817e9f99b7eb5c26312 100644 (file)
--- a/mono/metadata/marshal.c
+++ b/mono/metadata/marshal.c
@@ -1466,11 +1466,7 @@ conv_to_icall (MonoMarshalConv conv)
        case MONO_MARSHAL_CONV_LPWSTR_STR:
                return mono_string_from_utf16;
        case MONO_MARSHAL_CONV_LPTSTR_STR:
-#ifdef TARGET_WIN32
-               return mono_string_from_utf16;
-#else
                return mono_string_new_wrapper;
-#endif
        case MONO_MARSHAL_CONV_LPSTR_STR:
                return mono_string_new_wrapper;
        case MONO_MARSHAL_CONV_STR_LPTSTR: