From: Owen Taylor Date: Thu, 3 May 2001 10:12:46 +0000 (+0000) Subject: Make types of ternary operator correspond. (Fixes compilation errors with X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=39f526ef20b6efbdf75d7035523a78cd1a85b99b;p=dana%2Fcg-glib.git Make types of ternary operator correspond. (Fixes compilation errors with Thu May 3 06:10:23 2001 Owen Taylor * gobject.c (g_object_set_[q]data_full): Make types of ternary operator correspond. (Fixes compilation errors with Sun CC, #52230) --- diff --git a/gobject/ChangeLog b/gobject/ChangeLog index de0aa027..d4b7f595 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,9 @@ +Thu May 3 06:10:23 2001 Owen Taylor + + * gobject.c (g_object_set_[q]data_full): Make types of ternary + operator correspond. (Fixes compilation errors with Sun CC, + #52230) + Mon Apr 30 20:03:56 2001 Tim Janik * glib-mkenums (usage): removed \v escaping, newer perl versions don't diff --git a/gobject/gobject.c b/gobject/gobject.c index 0ee30a6f..8117a5ef 100644 --- a/gobject/gobject.c +++ b/gobject/gobject.c @@ -1281,7 +1281,8 @@ g_object_set_qdata_full (GObject *object, g_return_if_fail (G_IS_OBJECT (object)); g_return_if_fail (quark > 0); - g_datalist_id_set_data_full (&object->qdata, quark, data, data ? destroy : NULL); + g_datalist_id_set_data_full (&object->qdata, quark, data, + data ? destroy : (GDestroyNotify) NULL); } gpointer @@ -1328,7 +1329,8 @@ g_object_set_data_full (GObject *object, g_return_if_fail (G_IS_OBJECT (object)); g_return_if_fail (key != NULL); - g_datalist_id_set_data_full (&object->qdata, g_quark_from_string (key), data, data ? destroy : NULL); + g_datalist_id_set_data_full (&object->qdata, g_quark_from_string (key), data, + data ? destroy : (GDestroyNotify) NULL); } gpointer