gst/: Fix double-import issues on macosx.

Original commit message from CVS:
* gst/common.h:
* gst/gstmodule.c:
* gst/interfaces.override:
* gst/pbutils.override:
* gst/pygstiterator.c:
* gst/pygstminiobject.c:
* gst/pygstminiobject.h:
Fix double-import issues on macosx.
Fixes #461838

diff --git a/ChangeLog b/ChangeLog
index 1311d4b..9533986 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2008-06-26  Edward Hervey  <edward.hervey@collabora.co.uk>
 
+       * gst/common.h:
+       * gst/gstmodule.c:
+       * gst/interfaces.override:
+       * gst/pbutils.override:
+       * gst/pygstiterator.c:
+       * gst/pygstminiobject.c:
+       * gst/pygstminiobject.h:
+       Fix double-import issues on macosx.
+       Fixes #461838
+
+2008-06-26  Edward Hervey  <edward.hervey@collabora.co.uk>
+
        * gst/gstmodule.c: (pygstminiobject_from_gvalue):
        Return None if GstMiniObject GValue doesn't contain anything (NULL).
        Fixes #540221

diff --git a/gst/common.h b/gst/common.h
index a487b1a..c2ffeb4 100644 (file)
--- a/gst/common.h
+++ b/gst/common.h
@@ -28,7 +28,7 @@
 #include <glib-object.h>
 #include <gst/gst.h>
 
-#include "pygobject.h"
+#include <pygobject.h>
 #include "pygstminiobject.h"
 
 #if (defined HAVE_OLD_PYGTK && (PY_VERSION_HEX < 0x02030000))

diff --git a/gst/gstmodule.c b/gst/gstmodule.c
index 4c6d483..49d2f79 100644 (file)
--- a/gst/gstmodule.c
+++ b/gst/gstmodule.c
@@ -24,15 +24,15 @@
 #include "config.h"
 #endif
 
-#include "pygstminiobject.h"
-#include "pygstexception.h"
-
-#include <locale.h>
-
 /* include this first, before NO_IMPORT_PYGOBJECT is defined */
 #include <pygobject.h>
 #include <gst/gst.h>
 #include <gst/gstversion.h>
+#include "common.h"
+#include "pygstexception.h"
+
+#include <locale.h>
+
 
 void pygst_register_classes (PyObject *d);
 void pygst_add_constants(PyObject *module, const gchar *strip_prefix);

diff --git a/gst/interfaces.override b/gst/interfaces.override
index 67ef6e8..a28952a 100644 (file)
--- a/gst/interfaces.override
+++ b/gst/interfaces.override
@@ -25,6 +25,8 @@ headers
 # include <config.h>
 #endif
 
+#define NO_IMPORT_PYGOBJECT
+
 #include "common.h"
 
 #include <gst/gst.h>

diff --git a/gst/pbutils.override b/gst/pbutils.override
index 15b8bc0..8e42685 100644 (file)
--- a/gst/pbutils.override
+++ b/gst/pbutils.override
@@ -24,6 +24,7 @@ headers
 # include <config.h>
 #endif
 
+#define NO_IMPORT_PYGOBJECT
 #include "common.h"
 
 #include <gst/gst.h>

diff --git a/gst/pygstiterator.c b/gst/pygstiterator.c
index 2dc987c..7d555f6 100644 (file)
--- a/gst/pygstiterator.c
+++ b/gst/pygstiterator.c
@@ -19,6 +19,9 @@
  * 
  * Author: Johan Dahlin <johan@gnome.org>
  */
+/* define this for all source files that don't run init_pygobject()
+ * before including pygobject.h */
+#define NO_IMPORT_PYGOBJECT
 
 #include "common.h"
 

diff --git a/gst/pygstminiobject.c b/gst/pygstminiobject.c
index 1f0ae2a..dcd4ded 100644 (file)
--- a/gst/pygstminiobject.c
+++ b/gst/pygstminiobject.c
@@ -20,6 +20,7 @@
  * USA
  */
 
+#define NO_IMPORT_PYGOBJECT
 #include "pygstminiobject.h"
 #include <gst/gst.h>
 

diff --git a/gst/pygstminiobject.h b/gst/pygstminiobject.h
index c1c5bd9..8551603 100644 (file)
--- a/gst/pygstminiobject.h
+++ b/gst/pygstminiobject.h
@@ -45,7 +45,6 @@ pygst_miniobject_init();
 
 #ifndef _INSIDE_PYGSTMINIOBJECT_
 
-struct _PyGObject_Functions *_PyGObject_API;
 
 extern PyTypeObject PyGstMiniObject_Type;