Author: benm
Date: 2005-06-26 13:22:27 -0400 (Sun, 26 Jun 2005)
New Revision: 46521

Modified:
   trunk/mono/mono/metadata/ChangeLog
   trunk/mono/mono/metadata/appdomain.c
   trunk/mono/mono/metadata/class.c
   trunk/mono/mono/metadata/domain.c
Log:
2005-06-26  Ben Maurer  <[EMAIL PROTECTED]>

        * *.c: Kill some warnings.



Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog  2005-06-26 16:21:06 UTC (rev 46520)
+++ trunk/mono/mono/metadata/ChangeLog  2005-06-26 17:22:27 UTC (rev 46521)
@@ -1,3 +1,7 @@
+2005-06-26  Ben Maurer  <[EMAIL PROTECTED]>
+
+       * *.c: Kill some warnings.
+
 2005-06-23  Duncan Mak  <[EMAIL PROTECTED]>
 
        * socket-io.c (is_loopback): Cast 'ptr' to 'struct in6_addr *' so

Modified: trunk/mono/mono/metadata/appdomain.c
===================================================================
--- trunk/mono/mono/metadata/appdomain.c        2005-06-26 16:21:06 UTC (rev 
46520)
+++ trunk/mono/mono/metadata/appdomain.c        2005-06-26 17:22:27 UTC (rev 
46521)
@@ -581,7 +581,7 @@
                g_assert (assembly_load_field);
        }
 
-       mono_field_get_value (domain->domain, assembly_load_field, &load_value);
+       mono_field_get_value ((MonoObject*) domain->domain, 
assembly_load_field, &load_value);
        if (load_value == NULL) {
                /* No events waiting to be triggered */
                return;

Modified: trunk/mono/mono/metadata/class.c
===================================================================
--- trunk/mono/mono/metadata/class.c    2005-06-26 16:21:06 UTC (rev 46520)
+++ trunk/mono/mono/metadata/class.c    2005-06-26 17:22:27 UTC (rev 46521)
@@ -1310,8 +1310,8 @@
        mono_class_init (gklass);
        class->vtable_size = gklass->vtable_size;
 
-       class->vtable = g_new0 (gpointer, class->vtable_size);
-       memcpy (class->vtable, gklass->vtable,  sizeof (gpointer) * 
class->vtable_size);
+       class->vtable = g_new0 (MonoMethod*, class->vtable_size);
+       memcpy (class->vtable, gklass->vtable,  sizeof (MonoMethod*) * 
class->vtable_size);
 
        for (i = 0; i < class->vtable_size; i++) {
                MonoMethod *m = class->vtable [i];
@@ -1324,9 +1324,9 @@
        }
 
        class->max_interface_id = gklass->max_interface_id;
-       class->interface_offsets = g_new0 (gpointer, gklass->max_interface_id + 
1);
+       class->interface_offsets = g_new0 (gint, gklass->max_interface_id + 1);
        memcpy (class->interface_offsets, gklass->interface_offsets,
-               sizeof (gpointer) * (gklass->max_interface_id + 1));
+               sizeof (gint) * (gklass->max_interface_id + 1));
 }
 
 /*
@@ -1490,7 +1490,6 @@
                                        continue;
 
                                if (ic->generic_class) {
-                                       MonoClass *the_ic = 
ic->generic_class->container_class;
                                        the_cname = mono_type_get_name_full 
(&ic->byval_arg, MONO_TYPE_NAME_FORMAT_IL);
                                        cname = the_cname;
                                } else {
@@ -2483,7 +2482,6 @@
 mono_class_create_generic_2 (MonoGenericClass *gclass)
 {
        MonoClass *klass, *gklass;
-       GList *list;
        int i;
 
        klass = gclass->klass;

Modified: trunk/mono/mono/metadata/domain.c
===================================================================
--- trunk/mono/mono/metadata/domain.c   2005-06-26 16:21:06 UTC (rev 46520)
+++ trunk/mono/mono/metadata/domain.c   2005-06-26 17:22:27 UTC (rev 46521)
@@ -235,7 +235,7 @@
        return h;       
 }
 
-gboolean
+static gboolean
 mono_ptrarray_equal (gpointer *s1, gpointer *s2)
 {
        int len = GPOINTER_TO_INT (s1 [0]);
@@ -245,7 +245,7 @@
        return memcmp (s1 + 1, s2 + 1, len * sizeof(gpointer)) == 0; 
 }
 
-guint
+static guint
 mono_ptrarray_hash (gpointer *s)
 {
        int i;

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to