Make types of ternary operator correspond. (Fixes compilation errors with

Thu May  3 06:10:23 2001  Owen Taylor  <otaylor@redhat.com>

	* 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 de0aa0271409a9f62e56f618243b94cc177e5eeb..d4b7f59525e68a58b6c2e4cc6a03d597a34a557d 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,9 @@
+Thu May  3 06:10:23 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <timj@gtk.org>
 
        * glib-mkenums (usage): removed \v escaping, newer perl versions don't

diff --git a/gobject/gobject.c b/gobject/gobject.c
index 0ee30a6fe2061f7d1f1bf5be9177ee4c9f97aacf..8117a5ef774329ecbc36953d2ff2a809c8ad6112 100644 (file)
--- 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