summaryrefslogtreecommitdiffstats
path: root/gobject
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2007-07-04 12:59:00 +0000
committerMurray Cumming <murrayc@src.gnome.org>2007-07-04 12:59:00 +0000
commit73b8042c42ede774597b5bc235a70f8f13643b91 (patch)
treee18c8af63669aa107abdc62c05747b2bc816ca0c /gobject
parentd1e9ef6614199ea886f2bb2864410383c00fe6f4 (diff)
downloadpygobject-73b8042c42ede774597b5bc235a70f8f13643b91.tar.gz
pygobject-73b8042c42ede774597b5bc235a70f8f13643b91.tar.xz
pygobject-73b8042c42ede774597b5bc235a70f8f13643b91.zip
Rename the private struct field to private_flags, because private is a C++
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. svn path=/trunk/; revision=679
Diffstat (limited to 'gobject')
-rw-r--r--gobject/pygobject.c4
-rw-r--r--gobject/pygobject.h2
2 files changed, 3 insertions, 3 deletions
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;