revert last change, it breaks all users of G_IMPLEMENT_INTERFACE() inside

2005-09-28  Michael Natterer  <mitch@gimp.org>

	* 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.
This commit is contained in:
Michael Natterer 2005-09-27 23:19:16 +00:00 committed by Michael Natterer
parent 09a819fef9
commit e02b163efd
2 changed files with 8 additions and 3 deletions

View File

@ -1,3 +1,10 @@
2005-09-28 Michael Natterer <mitch@gimp.org>
* 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 <dindinx@gimp.org>
* gobject/gtype.h: initialize all the fields of GInterfaceInfo in the

View File

@ -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); \
}