Fixed C99isms in atk-bridge/bridge.c, cspi/bonobo/cspi-bonobo.c.

Patch from Jens Granseuer.

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

diff --git a/ChangeLog b/ChangeLog
index 6726fc76aa73d8d04fab6e761b1aa68f681da7ac..1ca0b01fae57a3e1a46ad10f21444e43c34a591a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-09-03 Bill Haneman    <bill.haneman@sun.com>
+
+       * cspi/bonobo/cspi-bonobo.c:
+       (cspi_display_name): Fix C99ism.
+       * atk-bridge/bridge.c:
+       (spi_display_name): Fix C99ism.
+       Patch from Jens Granseuer, jensgr@gmx.net.
+       
 2004-09-03  Gora Mohanty  <gmohanty@cvs.gnome.org>
  
        * configure.in: Added "or" to ALL_LINGUAS.

diff --git a/atk-bridge/bridge.c b/atk-bridge/bridge.c
index 080728515d7d78784db10f5b01af0179aed191af..6161b1912384bf4d3d9e742b313003e5404e9f33 100644 (file)
--- a/atk-bridge/bridge.c
+++ b/atk-bridge/bridge.c
@@ -287,9 +287,10 @@ spi_display_name (void)
                canonical_display_name = ":0";
            else
            {
+               gchar *display_p, *screen_p;
                canonical_display_name = g_strdup (display_env);
-               gchar *display_p = strrchr (canonical_display_name, ':');
-               gchar *screen_p = strrchr (canonical_display_name, '.');
+               display_p = strrchr (canonical_display_name, ':');
+               screen_p = strrchr (canonical_display_name, '.');
                if (screen_p && display_p && ((guint) screen_p > (guint) display_p))
                {
                    *screen_p = '\0';

diff --git a/cspi/bonobo/cspi-bonobo.c b/cspi/bonobo/cspi-bonobo.c
index fde0f0a03ec96b498813fd3c7b0c38f7874102aa..0ab14a8c9fc642f1148f51036378080ae7fbed15 100644 (file)
--- a/cspi/bonobo/cspi-bonobo.c
+++ b/cspi/bonobo/cspi-bonobo.c
@@ -96,9 +96,10 @@ cspi_display_name (void)
                canonical_display_name = ":0";
            else
            {
+               gchar *display_p, *screen_p;
                canonical_display_name = g_strdup (display_env);
-               gchar *display_p = strrchr (canonical_display_name, ':');
-               gchar *screen_p = strrchr (canonical_display_name, '.');
+               display_p = strrchr (canonical_display_name, ':');
+               screen_p = strrchr (canonical_display_name, '.');
                if (screen_p && display_p && ((guint) screen_p > (guint) display_p))
                {
                    *screen_p = '\0';