Author: lupus
Date: 2005-12-13 09:34:06 -0500 (Tue, 13 Dec 2005)
New Revision: 54281

Modified:
   trunk/mono/mono/metadata/marshal.c
   trunk/mono/mono/mini/mini-ppc.c
   trunk/mono/mono/os/gc_wrapper.h
Log:
Patches from the Suse autobuild.


Modified: trunk/mono/mono/metadata/marshal.c
===================================================================
--- trunk/mono/mono/metadata/marshal.c  2005-12-13 14:09:58 UTC (rev 54280)
+++ trunk/mono/mono/metadata/marshal.c  2005-12-13 14:34:06 UTC (rev 54281)
@@ -333,7 +333,7 @@
 
        delegate_hash_table_remove (delegate);
 
-       ptr = InterlockedExchangePointer (&delegate->delegate_trampoline, NULL);
+       ptr = (gpointer)InterlockedExchangePointer 
(&delegate->delegate_trampoline, NULL);
 
        if (!delegate->target) {
                /* The wrapper method is shared between delegates -> no need to 
free it */

Modified: trunk/mono/mono/mini/mini-ppc.c
===================================================================
--- trunk/mono/mono/mini/mini-ppc.c     2005-12-13 14:09:58 UTC (rev 54280)
+++ trunk/mono/mono/mini/mini-ppc.c     2005-12-13 14:34:06 UTC (rev 54281)
@@ -3034,7 +3034,7 @@
                        g_assert_not_reached ();
                        break;
                case OP_LOCALLOC: {
-                       guint32 * zero_loop_jump, zero_loop_start;
+                       guint32 * zero_loop_jump, * zero_loop_start;
                        /* keep alignment */
                        int alloca_waste = PPC_STACK_PARAM_OFFSET + 
cfg->param_area + 31;
                        int area_offset = alloca_waste;
@@ -3986,6 +3986,7 @@
        if (strcmp (name, "ArrayTypeMismatchException") == 0)
                return MONO_EXC_ARRAY_TYPE_MISMATCH;
        g_error ("Unknown intrinsic exception %s\n", name);
+       return 0;
 }
 
 void

Modified: trunk/mono/mono/os/gc_wrapper.h
===================================================================
--- trunk/mono/mono/os/gc_wrapper.h     2005-12-13 14:09:58 UTC (rev 54280)
+++ trunk/mono/mono/os/gc_wrapper.h     2005-12-13 14:34:06 UTC (rev 54281)
@@ -20,7 +20,7 @@
         * it if it is the included one.
         */
        
-#      if defined(HAVE_KW_THREAD) && defined(USE_INCLUDED_LIBGC)  
+#      if defined(HAVE_KW_THREAD) && defined(USE_INCLUDED_LIBGC) && 
!defined(__powerpc__)
 #              define GC_REDIRECT_TO_LOCAL
 #      endif
 

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

Reply via email to