Merge pull request #3902 from henricm/fix-rename-lpstr-utf8

Rename fix for lpstr to utf8str on Windows

diff --combined mono/metadata/marshal.c
index a9674cc1aaf944357e8575c05b6d6a84de87b4a0,eb382ab81ce61dfb513f843d583a2ed411a6b811..a743f83f6300731c27ee5dc55c9da46bcb76ef24
--- 1/mono/metadata/marshal.c
--- 2/mono/metadata/marshal.c
+++ b/mono/metadata/marshal.c
@@@ -109,8 -109,10 +109,10 @@@ mono_marshal_string_to_utf16 (MonoStrin
  static void *
  mono_marshal_string_to_utf16_copy (MonoString *s);
  
+ #ifndef HOST_WIN32
  static gpointer
  mono_string_to_utf8str (MonoString *string_obj);
+ #endif
  
  static MonoStringBuilder *
  mono_string_utf8_to_builder2 (char *text);
@@@ -1080,6 -1082,7 +1082,7 @@@ mono_string_builder_to_utf16 (MonoStrin
        return str;
  }
  
+ #ifndef HOST_WIN32
  /* This is a JIT icall, it sets the pending exception and returns NULL on error. */
  static gpointer
  mono_string_to_utf8str (MonoString *s)
@@@ -1089,6 -1092,7 +1092,7 @@@
        mono_error_set_pending_exception (&error);
        return result;
  }
+ #endif
  
  gpointer
  mono_string_to_ansibstr (MonoString *string_obj)
@@@ -9936,14 -9940,14 +9940,14 @@@ get_virtual_stelemref_wrapper (int kind
                /* uiid = klass->interface_id; */
                mono_mb_emit_ldloc (mb, aklass);
                mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoClass, interface_id));
 -              mono_mb_emit_byte (mb, CEE_LDIND_U2);
 +              mono_mb_emit_byte (mb, CEE_LDIND_U4);
                mono_mb_emit_stloc (mb, uiid);
  
                /*if (uiid > vt->max_interface_id)*/
                mono_mb_emit_ldloc (mb, uiid);
                mono_mb_emit_ldloc (mb, vtable);
                mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoVTable, max_interface_id));
 -              mono_mb_emit_byte (mb, CEE_LDIND_U2);
 +              mono_mb_emit_byte (mb, CEE_LDIND_U4);
                b2 = mono_mb_emit_branch (mb, CEE_BGT_UN);
  
                /* if (!(vt->interface_bitmap [(uiid) >> 3] & (1 << ((uiid)&7)))) */