summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo J. A. M. Carneiro <gcarneiro@src.gnome.org>2004-10-13 20:12:09 +0000
committerGustavo J. A. M. Carneiro <gcarneiro@src.gnome.org>2004-10-13 20:12:09 +0000
commit3d5c74c5aea68305f086dbb87a79ff1c8c2b13ae (patch)
tree736d436b1f096028c8c425f8ac72d140e6f47f7e
parent8ef24da13db8694ce9ff0dc025ff4d7883cd9811 (diff)
downloadpygobject-3d5c74c5aea68305f086dbb87a79ff1c8c2b13ae.tar.gz
pygobject-3d5c74c5aea68305f086dbb87a79ff1c8c2b13ae.tar.xz
pygobject-3d5c74c5aea68305f086dbb87a79ff1c8c2b13ae.zip
Bug 155304: pygobject.h cannot be included in C++ programs
-rw-r--r--gobject/pygobject.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/gobject/pygobject.h b/gobject/pygobject.h
index ec06faa..056d3e3 100644
--- a/gobject/pygobject.h
+++ b/gobject/pygobject.h
@@ -7,6 +7,8 @@
#include <glib.h>
#include <glib-object.h>
+G_BEGIN_DECLS
+
/* Work around bugs in PyGILState api fixed in 2.4.0a4 */
#if PY_HEXVERSION < 0x020400A4
#define PYGIL_API_IS_BUGGY TRUE
@@ -137,14 +139,14 @@ struct _PyGObject_Functions {
const GParamSpec* pspec);
PyTypeObject *enum_type;
PyObject *(*enum_add)(PyObject *module,
- const char *typename,
+ const char *typename_,
const char *strip_prefix,
GType gtype);
PyObject* (*enum_from_gtype)(GType gtype, int value);
PyTypeObject *flags_type;
PyObject *(*flags_add)(PyObject *module,
- const char *typename,
+ const char *typename_,
const char *strip_prefix,
GType gtype);
PyObject* (*flags_from_gtype)(GType gtype, int value);
@@ -253,4 +255,6 @@ struct _PyGObject_Functions *_PyGObject_API;
#endif /* !_INSIDE_PYGOBJECT_ */
+G_END_DECLS
+
#endif /* !_PYGOBJECT_H_ */