From 6869b941b6813c60745fbd7b1c881c83b8a29b5e Mon Sep 17 00:00:00 2001 From: Li Yuan Date: Sun, 18 Sep 2011 22:02:08 -0500 Subject: [PATCH] BGO#657051: Fix build error on Solaris --- atspi/atspi-event-listener.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/atspi/atspi-event-listener.c b/atspi/atspi-event-listener.c index 309ac31..f0a4ad8 100644 --- a/atspi/atspi-event-listener.c +++ b/atspi/atspi-event-listener.c @@ -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)) { -- 2.7.4