applied patch from Behdad with slight optimization, fixes #356175.

Fri Sep 22 13:41:02 2006  Tim Janik  <timj@imendio.com>

        * gtype.h: applied patch from Behdad with slight optimization,
        fixes #356175.

        * gobjectnotifyqueue.c: fixed include-guard macro name.

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 0db43e9ef0c03beeb854751d81a980f1938141eb..f2f268aa334d4e558653d28d2bb31a446a03d58a 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,10 @@
+Fri Sep 22 13:41:02 2006  Tim Janik  <timj@imendio.com>
+
+       * gtype.h: applied patch from Behdad with slight optimization, 
+       fixes #356175.
+
+       * gobjectnotifyqueue.c: fixed include-guard macro name.
+
 Mon Sep 11 12:12:45 2006  Tim Janik  <timj@imendio.com>
 
        * gparam.c (g_param_spec_sink): reimplemented floating flag handling by

diff --git a/gobject/gobjectnotifyqueue.c b/gobject/gobjectnotifyqueue.c
index 65c8e9546bf27bdb0d671a33c63827e8d1a59dd0..60c1c280728e3d76085548e42bcc8eb3b490e0c7 100644 (file)
--- a/gobject/gobjectnotifyqueue.c
+++ b/gobject/gobjectnotifyqueue.c
@@ -16,8 +16,8 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#ifndef __G_NOTIFY_H__
-#define __G_NOTIFY_H__
+#ifndef __G_OBJECT_NOTIFY_QUEUE_H__
+#define __G_OBJECT_NOTIFY_QUEUE_H__
 
 #include        <string.h> /* memset */
 #include        <glib-object.h>
@@ -166,4 +166,4 @@ g_object_notify_queue_from_object (GObject              *object,
 
 G_END_DECLS
 
-#endif /* __G_NOTIFY_H__ */
+#endif /* __G_OBJECT_NOTIFY_QUEUE_H__ */

diff --git a/gobject/gtype.h b/gobject/gtype.h
index 555c4d9bb4a42bf93cec006a4c75adfe9b025196..1a86643c4dadb52f0f60447f737f608f549ca891 100644 (file)
--- a/gobject/gtype.h
+++ b/gobject/gtype.h
@@ -348,7 +348,7 @@ gpointer g_type_instance_get_private    (GTypeInstance              *instance,
  *                                                 gtk_tree_store_tree_model_init));
  */
 #define G_IMPLEMENT_INTERFACE(TYPE_IFACE, iface_init)       { \
-  static const GInterfaceInfo g_implement_interface_info = { \
+  const GInterfaceInfo g_implement_interface_info = { \
     (GInterfaceInitFunc) iface_init, NULL, NULL \
   }; \
   g_type_add_interface_static (g_define_type_id, TYPE_IFACE, &g_implement_interface_info); \