mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-05 17:09:48 +00:00
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
This commit is contained in:
parent
4e33f9fdcc
commit
103e13fa66
8 changed files with 25 additions and 7 deletions
12
ChangeLog
12
ChangeLog
|
@ -1,3 +1,15 @@
|
|||
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):
|
||||
|
|
|
@ -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))
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -25,6 +25,8 @@ headers
|
|||
# include <config.h>
|
||||
#endif
|
||||
|
||||
#define NO_IMPORT_PYGOBJECT
|
||||
|
||||
#include "common.h"
|
||||
|
||||
#include <gst/gst.h>
|
||||
|
|
|
@ -24,6 +24,7 @@ headers
|
|||
# include <config.h>
|
||||
#endif
|
||||
|
||||
#define NO_IMPORT_PYGOBJECT
|
||||
#include "common.h"
|
||||
|
||||
#include <gst/gst.h>
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
* USA
|
||||
*/
|
||||
|
||||
#define NO_IMPORT_PYGOBJECT
|
||||
#include "pygstminiobject.h"
|
||||
#include <gst/gst.h>
|
||||
|
||||
|
|
|
@ -45,7 +45,6 @@ pygst_miniobject_init();
|
|||
|
||||
#ifndef _INSIDE_PYGSTMINIOBJECT_
|
||||
|
||||
struct _PyGObject_Functions *_PyGObject_API;
|
||||
|
||||
extern PyTypeObject PyGstMiniObject_Type;
|
||||
|
||||
|
|
Loading…
Reference in a new issue