summaryrefslogtreecommitdiff
path: root/gobject
diff options
context:
space:
mode:
authorTim Janik <timj@imendio.com>2006-09-22 12:06:28 +0000
committerTim Janik <timj@src.gnome.org>2006-09-22 12:06:28 +0000
commitb6a3cd8039125e04d6f72d37c2bbf46610c9959c (patch)
tree1f9ca50098c9a24acaa84d28bc763c9e0d7ccbdb /gobject
parentb3a8c3288b1932476c4882bf83128027d4214056 (diff)
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.
Diffstat (limited to 'gobject')
-rw-r--r--gobject/ChangeLog7
-rw-r--r--gobject/gobjectnotifyqueue.c6
-rw-r--r--gobject/gtype.h2
3 files changed, 11 insertions, 4 deletions
diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 0db43e9ef..f2f268aa3 100644
--- 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 65c8e9546..60c1c2807 100644
--- 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 555c4d9bb..1a86643c4 100644
--- 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); \