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.

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 02e7a99eb3c9c481b3e2299562747cc3ff8fcf30..07dddb91dadb60ce59ada53d5de87d3cae8cb6b5 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -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

diff --git a/gobject/gtype.h b/gobject/gtype.h
index 9fd49ac71a974009035a7e28cfd77b2a461ba527..4ab0367f333aea33d91169b6cabde3f3e4684c30 100644 (file)
--- 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); \
 }