From e02b163efdad2752b4005e87258fa80fee334c40 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Tue, 27 Sep 2005 23:19:16 +0000 Subject: [PATCH] revert last change, it breaks all users of G_IMPLEMENT_INTERFACE() inside 2005-09-28 Michael Natterer * gtype.h (G_IMPLEMENT_INTERFACE): revert last change, it breaks all users of G_IMPLEMENT_INTERFACE() inside G_DEFINE_TYPE_WITH_CODE(), since apparently GCC doesn't like commas enclosed in {}, not (), in nested macro calls. --- gobject/ChangeLog | 7 +++++++ gobject/gtype.h | 4 +--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gobject/ChangeLog b/gobject/ChangeLog index 02e7a99..07dddb9 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,10 @@ +2005-09-28 Michael Natterer + + * gtype.h (G_IMPLEMENT_INTERFACE): revert last change, it breaks + all users of G_IMPLEMENT_INTERFACE() inside + G_DEFINE_TYPE_WITH_CODE(), since apparently GCC doesn't like + commas enclosed in {}, not (), in nested macro calls. + 2005-09-26 DindinX * gobject/gtype.h: initialize all the fields of GInterfaceInfo in the diff --git a/gobject/gtype.h b/gobject/gtype.h index 9fd49ac..4ab0367 100644 --- a/gobject/gtype.h +++ b/gobject/gtype.h @@ -340,9 +340,7 @@ gpointer g_type_instance_get_private (GTypeInstance *instance, */ #define G_IMPLEMENT_INTERFACE(TYPE_IFACE, iface_init) { \ static const GInterfaceInfo g_implement_interface_info = { \ - (GInterfaceInitFunc) iface_init, \ - (GInterfaceFinalizeFunc) NULL, \ - NULL \ + (GInterfaceInitFunc) iface_init \ }; \ g_type_add_interface_static (g_define_type_id, TYPE_IFACE, &g_implement_interface_info); \ } -- 2.7.4