summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--gio/pygio-utils.h3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 274ce1a6..1cd47fbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2008-07-18 Johan Dahlin <johan@gnome.org>
+ * gio/pygio-utils.h:
+ define NO_IMPORT_PYGOBJECT before including pygobject.h
+
+2008-07-18 Johan Dahlin <johan@gnome.org>
+
* gio/giomodule.c (init_gio):
Require pygobject 2.15.2
diff --git a/gio/pygio-utils.h b/gio/pygio-utils.h
index 0ebad553..02645baa 100644
--- a/gio/pygio-utils.h
+++ b/gio/pygio-utils.h
@@ -23,9 +23,10 @@
#ifndef __PYGIO_UTILS_H__
#define __PYGIO_UTILS_H__
+#define NO_IMPORT_PYGOBJECT
#include <Python.h>
-#include <gio/gio.h>
#include <pygobject.h>
+#include <gio/gio.h>
extern PyTypeObject PyGCancellable_Type;