x64 char*/guint cast fixes from chpe.

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@821 e2bd861d-eb25-0410-b326-f6ed22b6b98c

diff --git a/ChangeLog b/ChangeLog
index 6248c56..59a25c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,11 @@
 
        * cspi/spi-impl.h: Added #defines SPI_TRUE and SPI_FALSE
        for completeness.  Bug #163111.
+
+       * atk-bridge/bridge.c, cspi/bonobo/cspi-bonobo.c:
+       * libspi/util.c,  registryd/registry-main.c:
+       Fix guint/char* casts.
+       Patch from chpe, bug #333883.
        
 2006-06-12  Bill Haneman <bill.haneman@sun.com>
 

diff --git a/atk-bridge/bridge.c b/atk-bridge/bridge.c
index a56aa9b..b02cc4f 100644 (file)
--- a/atk-bridge/bridge.c
+++ b/atk-bridge/bridge.c
@@ -21,6 +21,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -311,7 +313,7 @@ spi_display_name (void)
                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';
                }

diff --git a/cspi/bonobo/cspi-bonobo.c b/cspi/bonobo/cspi-bonobo.c
index 8f6bb1e..573d957 100644 (file)
--- a/cspi/bonobo/cspi-bonobo.c
+++ b/cspi/bonobo/cspi-bonobo.c
@@ -100,7 +100,7 @@ cspi_display_name (void)
                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';
                }

diff --git a/libspi/util.c b/libspi/util.c
index c28ed8f..fa6e0d6 100644 (file)
--- a/libspi/util.c
+++ b/libspi/util.c
@@ -36,6 +36,8 @@ static GSList *working_list = NULL; /* of Iteration */
 
 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)
 {

diff --git a/registryd/registry-main.c b/registryd/registry-main.c
index 6e8f219..9da2b52 100644 (file)
--- a/registryd/registry-main.c
+++ b/registryd/registry-main.c
@@ -56,7 +56,7 @@ main (int argc, char **argv)
       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",