2004-07-29 Bernie Solomon <bernard@ugsolutions.com>

	* marshal.c (mono_marshal_init): make managed
	signatures match native ones better for 64bits.

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 8d1e2626996bb22bec6056ce471b0f6679c6e196..3a169c3e026e44d3a83a7a2ba5ca4fc05e189163 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-29  Bernie Solomon  <bernard@ugsolutions.com>
+
+       * marshal.c (mono_marshal_init): make managed
+       signatures match native ones better for 64bits.
+
 2004-07-29  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * appdomain.c: hack to build correctly the private bin path on windows.

diff --git a/mono/metadata/marshal.c b/mono/metadata/marshal.c
index 229c32185b50150674acd1f545a7dfd4e19780cd..a215757fdbd8a5fa7587af0037fdb80a47c239ea 100644 (file)
--- a/mono/metadata/marshal.c
+++ b/mono/metadata/marshal.c
@@ -122,13 +122,13 @@ mono_marshal_init (void)
                register_icall (mono_ftnptr_to_delegate, "mono_ftnptr_to_delegate", "object ptr ptr", FALSE);
                register_icall (mono_marshal_string_array, "mono_marshal_string_array", "ptr object", FALSE);
                register_icall (mono_marshal_string_array_to_unicode, "mono_marshal_string_array_to_unicode", "ptr object", FALSE);
-               register_icall (mono_marshal_asany, "mono_marshal_asany", "ptr object int", FALSE);
-               register_icall (mono_marshal_free_asany, "mono_marshal_free_asany", "void object ptr int", FALSE);
+               register_icall (mono_marshal_asany, "mono_marshal_asany", "ptr object int32", FALSE);
+               register_icall (mono_marshal_free_asany, "mono_marshal_free_asany", "void object ptr int32", FALSE);
                register_icall (mono_string_utf8_to_builder, "mono_string_utf8_to_builder", "void ptr ptr", FALSE);
                register_icall (mono_string_utf16_to_builder, "mono_string_utf16_to_builder", "void ptr ptr", FALSE);
-               register_icall (mono_marshal_free_array, "mono_marshal_free_array", "void ptr ptr", FALSE);
-               register_icall (mono_string_to_byvalstr, "mono_string_to_byvalstr", "void ptr ptr ptr", FALSE);
-               register_icall (mono_string_to_byvalwstr, "mono_string_to_byvalwstr", "void ptr ptr ptr", FALSE);
+               register_icall (mono_marshal_free_array, "mono_marshal_free_array", "void ptr int32", FALSE);
+               register_icall (mono_string_to_byvalstr, "mono_string_to_byvalstr", "void ptr ptr int32", FALSE);
+               register_icall (mono_string_to_byvalwstr, "mono_string_to_byvalwstr", "void ptr ptr int32", FALSE);
                register_icall (g_free, "g_free", "void ptr", FALSE);
                register_icall (mono_object_isinst, "mono_object_isinst", "object object ptr", FALSE);
        }