--- at-spi-1.7.7/registryd/registry-main.c.miscompile	2006-04-04 14:10:38.000000000 -0400
+++ at-spi-1.7.7/registryd/registry-main.c	2006-04-04 14:10:55.000000000 -0400
@@ -56,7 +56,7 @@
       display_name = g_strdup (gdk_display_get_name (gdk_display_get_default ()));
       cp = strrchr (display_name, '.');
       dp = strrchr (display_name, ':');
-      if (cp && dp && ((guint) cp > (guint) dp)) *cp = '\0';
+      if (cp && dp && (cp > dp)) *cp = '\0';
   }
 
   reg_env = bonobo_activation_registration_env_set ( reg_env, "AT_SPI_DISPLAY", 
--- at-spi-1.7.7/atk-bridge/bridge.c.miscompile	2006-04-04 14:11:43.000000000 -0400
+++ at-spi-1.7.7/atk-bridge/bridge.c	2006-04-04 15:20:38.000000000 -0400
@@ -311,7 +311,7 @@
 		canonical_display_name = g_strdup (display_env);
 		display_p = strrchr (canonical_display_name, ':');
 		screen_p = strrchr (canonical_display_name, '.');
-		if (screen_p && display_p && ((guint) screen_p > (guint) display_p))
+		if (screen_p && display_p && (screen_p > display_p))
 		{
 		    *screen_p = '\0';
 		}
@@ -694,7 +694,7 @@
   
   g_free (e.type);
 
-  if (e.any_data._release) CORBA_free (&e.any_data._value);
+  if (e.any_data._release) CORBA_free (e.any_data._value);
   
   va_end (args);
 
--- at-spi-1.7.7/cspi/bonobo/cspi-bonobo.c.miscompile	2006-04-04 14:20:31.000000000 -0400
+++ at-spi-1.7.7/cspi/bonobo/cspi-bonobo.c	2006-04-04 14:21:18.000000000 -0400
@@ -26,6 +26,9 @@
 #include <libbonobo.h>
 #include "../cspi-lowlevel.h"
 
+gboolean
+cspi_exception_throw (CORBA_Environment *ev, char *desc_prefix);
+
 CORBA_Object
 cspi_dup_ref (CORBA_Object object)
 {
@@ -100,7 +103,7 @@
 		canonical_display_name = g_strdup (display_env);
 		display_p = strrchr (canonical_display_name, ':');
 		screen_p = strrchr (canonical_display_name, '.');
-		if (screen_p && display_p && ((guint) screen_p > (guint) display_p))
+		if (screen_p && display_p && (screen_p > display_p))
 		{
 		    *screen_p = '\0';
 		}
--- at-spi-1.7.7/libspi/util.c.miscompile	2006-04-04 13:47:50.000000000 -0400
+++ at-spi-1.7.7/libspi/util.c	2006-04-04 13:48:35.000000000 -0400
@@ -36,6 +36,8 @@
 
 static char *spi_atk_bridge_null_string = "";
 
+Accessibility_Role spi_accessible_role_from_atk_role (AtkRole role);
+
 Accessibility_Role
 spi_role_from_atk_role (AtkRole role)
 {
