BGO#657051: Fix build error on Solaris
authorLi Yuan <lee.yuan@oracle.com>
Mon, 19 Sep 2011 03:02:08 +0000 (22:02 -0500)
committerMike Gorse <mgorse@novell.com>
Mon, 19 Sep 2011 03:02:08 +0000 (22:02 -0500)
atspi/atspi-event-listener.c

index 309ac31..f0a4ad8 100644 (file)
@@ -385,7 +385,7 @@ oom:
 static void
 listener_entry_free (EventListenerEntry *e)
 {
-  gpointer callback = (e->callback == remove_datum ? e->user_data : e->callback);
+  gpointer callback = (e->callback == remove_datum ? (gpointer)e->user_data : (gpointer)e->callback);
   g_free (e->category);
   g_free (e->name);
   if (e->detail) g_free (e->detail);
@@ -540,7 +540,7 @@ atspi_event_listener_register_from_callback (AtspiEventListenerCB callback,
   e->callback = callback;
   e->user_data = user_data;
   e->callback_destroyed = callback_destroyed;
-  callback_ref (callback == remove_datum ? user_data : callback,
+  callback_ref (callback == remove_datum ? (gpointer)user_data : (gpointer)callback,
                 callback_destroyed);
   if (!convert_event_type_to_dbus (event_type, &e->category, &e->name, &e->detail, &matchrule))
   {