Author: zoltan
Date: 2007-02-28 09:42:28 -0500 (Wed, 28 Feb 2007)
New Revision: 73555
Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/marshal.c
Log:
2007-02-28 Zoltan Varga <[EMAIL PROTECTED]>
* marshal.c: Fix warnings.
Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2007-02-28 14:38:27 UTC (rev 73554)
+++ trunk/mono/mono/metadata/ChangeLog 2007-02-28 14:42:28 UTC (rev 73555)
@@ -1,4 +1,7 @@
+2007-02-28 Zoltan Varga <[EMAIL PROTECTED]>
+ * marshal.c: Fix warnings.
+
Fri Feb 23 15:06:57 CET 2007 Paolo Molaro <[EMAIL PROTECTED]>
* loader.c: allow case-insensitive matching of the dll name
Modified: trunk/mono/mono/metadata/marshal.c
===================================================================
--- trunk/mono/mono/metadata/marshal.c 2007-02-28 14:38:27 UTC (rev 73554)
+++ trunk/mono/mono/metadata/marshal.c 2007-02-28 14:42:28 UTC (rev 73555)
@@ -10079,7 +10079,7 @@
return (*(MonoIUnknown**)pUnk)->Release(pUnk);
}
-void*
+static void*
cominterop_get_idispatch_for_object (MonoObject* object)
{
if (!object)
@@ -11326,7 +11326,7 @@
ccw_list->data = ccw;
}
else
- g_list_append (ccw_list, ccw);
+ ccw_list = g_list_append (ccw_list, ccw);
g_hash_table_insert (ccw_hash, GINT_TO_POINTER
(mono_object_hash (object)), ccw_list);
/* register for finalization to clean up ccw */
mono_object_register_finalizer (object);
@@ -11612,7 +11612,7 @@
* Converts the standard string representation of a GUID
* to a 16 byte Microsoft GUID.
*/
-void
+static void
cominterop_mono_string_to_guid (const MonoString* string, guint8 *guid) {
gunichar2 * chars = mono_string_chars (string);
int i = 0;
@@ -11673,7 +11673,7 @@
g_assert (ccw);
g_assert (ccw->gc_handle);
g_assert (ccw->ref_count >= 0);
- ref_count = InterlockedIncrement (&ccw->ref_count);
+ ref_count = InterlockedIncrement ((gint32*)&ccw->ref_count);
if (ref_count == 1) {
guint32 oldhandle = ccw->gc_handle;
g_assert (oldhandle);
@@ -11691,7 +11691,7 @@
MonoCCW* ccw = ccwe->ccw;
g_assert (ccw);
g_assert (ccw->ref_count > 0);
- ref_count = InterlockedDecrement (&ccw->ref_count);
+ ref_count = InterlockedDecrement ((gint32*)&ccw->ref_count);
if (ref_count == 0) {
/* allow gc of object */
guint32 oldhandle = ccw->gc_handle;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
