Author: zoltan
Date: 2005-05-01 09:23:22 -0400 (Sun, 01 May 2005)
New Revision: 43839
Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/marshal.c
Log:
2005-05-01 Zoltan Varga <[EMAIL PROTECTED]>
* marshal.c (mono_marshal_get_managed_wrapper): Handle changing the
calling convention.
Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2005-05-01 12:20:36 UTC (rev 43838)
+++ trunk/mono/mono/metadata/ChangeLog 2005-05-01 13:23:22 UTC (rev 43839)
@@ -1,3 +1,7 @@
+2005-05-01 Zoltan Varga <[EMAIL PROTECTED]>
+
+ * marshal.c (mono_marshal_get_managed_wrapper): Handle changing the
calling convention.
+
2005-05-01 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* gc.c: In mono_gc_cleanup(), wait for 2 seconds, not 2000 seconds.
Modified: trunk/mono/mono/metadata/marshal.c
===================================================================
--- trunk/mono/mono/metadata/marshal.c 2005-05-01 12:20:36 UTC (rev 43838)
+++ trunk/mono/mono/metadata/marshal.c 2005-05-01 13:23:22 UTC (rev 43839)
@@ -6147,8 +6147,7 @@
m.piinfo = &piinfo;
piinfo.piflags = (attr->call_conv << 8) |
(attr->charset ? (attr->charset - 1) * 2 : 1) | attr->set_last_error;
- g_warning ("calling convention modification not
yet implemented for UnmanagedFunctionPointerAttribute");
- g_assert_not_reached ();
+ csig->call_convention = attr->call_conv - 1;
}
if (!cinfo->cached)
mono_custom_attrs_free (cinfo);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches