diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gobject/pygobject.c | 4 | ||||
| -rw-r--r-- | gobject/pygobject.h | 2 |
3 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,10 @@ +2007-07-04 Murray Cumming <murrayc@murrayc.com> + + * gobject/pygobject.c: (pygobject_switch_to_toggle_ref): + * gobject/pygobject.h: Rename the private struct field to + private_flags, because private is a C++ keyword, so this broke + builds of some C++ applications, such as Glom. + 2007-07-02 Sebastian Granjoux <seb.sfo@free.fr> reviewed by: Johan Dahlin diff --git a/gobject/pygobject.c b/gobject/pygobject.c index f889bc5..fb3fb1d 100644 --- a/gobject/pygobject.c +++ b/gobject/pygobject.c @@ -649,9 +649,9 @@ pygobject_switch_to_toggle_ref(PyGObject *self) { g_assert(self->obj->ref_count >= 1); - if (self->private.flags & PYGOBJECT_USING_TOGGLE_REF) + if (self->private_flags.flags & PYGOBJECT_USING_TOGGLE_REF) return; /* already using toggle ref */ - self->private.flags |= PYGOBJECT_USING_TOGGLE_REF; + self->private_flags.flags |= PYGOBJECT_USING_TOGGLE_REF; /* Note that add_toggle_ref will never immediately call back into pyg_toggle_notify */ Py_INCREF((PyObject *) self); diff --git a/gobject/pygobject.h b/gobject/pygobject.h index aacb52e..ef19f67 100644 --- a/gobject/pygobject.h +++ b/gobject/pygobject.h @@ -43,7 +43,7 @@ typedef struct { union { GSList *closures; /* stale field; no longer updated DO-NOT-USE! */ PyGObjectFlags flags; - } private; + } private_flags; } PyGObject; |