luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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)
This commit is contained in:
Owen Taylor 2001-05-03 10:12:46 +00:00 committed by Owen Taylor
parent d4e0ae748a
commit 39f526ef20
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gobject/ChangeLog
View File

@ -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

6
gobject/gobject.c
View File

@ -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