2009-10-18 Zoltan Varga <vargaz@gmail.com>

	* aot-compiler.c (can_marshal_struct): Allow some System.dll structs to be
	marshalled. Fixes #541623.

svn path=/trunk/mono/; revision=144331

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index f18b5dd2222ecc3f9d624ce28be3bce50fa947cf..95b64213ad6cb24db929014c0beba72840d15190 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-18  Zoltan Varga  <vargaz@gmail.com>
+
+       * aot-compiler.c (can_marshal_struct): Allow some System.dll structs to be
+       marshalled. Fixes #541623.
+
 2009-10-16  Zoltan Varga  <vargaz@gmail.com>
 
        * aot-compiler.c (emit_extra_methods): Remove some asserts which are not needed.

diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c
index 323918104716b8c0305ea57aaa2ec768d7320ae7..6c49c0347bad7e2334162e1f32275f3339b5a140 100644 (file)
--- a/mono/mini/aot-compiler.c
+++ b/mono/mini/aot-compiler.c
@@ -1751,6 +1751,11 @@ can_marshal_struct (MonoClass *klass)
                }
        }
 
+       /* Special cases */
+       /* Its hard to compute whenever these can be marshalled or not */
+       if (!strcmp (klass->name_space, "System.Net.NetworkInformation.MacOsStructs"))
+               return TRUE;
+
        return can_marshal;
 }