--- hw/xfree86/common.orig/xf86Events.c	2006-06-27 10:16:25.000000000 +0000
+++ hw/xfree86/common/xf86Events.c	2006-06-27 10:43:01.000000000 +0000
@@ -1292,8 +1292,8 @@
     size_t size, i;
     char **strings;
     ErrorF("\nBacktrace:\n");
-    size = backtrace(array, 32);
-    strings = backtrace_symbols(array, size);
+    size = (size_t) backtrace(array, 32);
+    strings = (char **) backtrace_symbols(array, size);
     for (i = 0; i < size; i++)
         ErrorF("%d: %s\n", i, strings[i]);
     free(strings);
--- hw/xfree86/dri/drimodule.c.orig	2006-12-08 20:54:05.218730315 +0100
+++ hw/xfree86/dri/drimodule.c	2006-12-08 20:54:46.246132159 +0100
@@ -88,6 +88,6 @@
     drmSetServerInfo(&DRIDRMServerInfo);
 
     /* Need a non-NULL return value to indicate success */
-    return 1;
+    return (pointer) 1;
 }