diff --git a/ChangeLog b/ChangeLog index 0c7ad320ed..6c9f92b8c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-10-12 Julien MOUTTE + + * gst/gst-argtypes.c: + * gst/pygstminiobject.c: + * testsuite/testhelpermodule.c: Reordering header inclusion order to + fix build on my machine. + 2005-10-12 Thomas Vander Stichele * gst/gst.defs: diff --git a/common b/common index 615cf4d450..37ed26e33b 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 615cf4d4506ef1ffb1f600c434fced1fa26b0f44 +Subproject commit 37ed26e33bae9a6ab256c62ebbb9d711374a0abb diff --git a/gst/gst-argtypes.c b/gst/gst-argtypes.c index c35acc5293..f84d6b7a27 100644 --- a/gst/gst-argtypes.c +++ b/gst/gst-argtypes.c @@ -23,8 +23,8 @@ * before including pygobject.h */ #define NO_IMPORT_PYGOBJECT -#include #include "common.h" +#include /* This function will return a copy, unless the following is all TRUE: * - The given PyObject contains a GstCaps already diff --git a/gst/pygstminiobject.c b/gst/pygstminiobject.c index e678f8cfef..c84b68f955 100644 --- a/gst/pygstminiobject.c +++ b/gst/pygstminiobject.c @@ -19,8 +19,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA */ -#include + #include "pygstminiobject.h" +#include static const gchar *pygstminiobject_class_id = "PyGstMiniObject::class"; static GQuark pygstminiobject_class_key = 0; diff --git a/testsuite/testhelpermodule.c b/testsuite/testhelpermodule.c index 265fa17c33..1325262ade 100644 --- a/testsuite/testhelpermodule.c +++ b/testsuite/testhelpermodule.c @@ -1,9 +1,9 @@ -#include -#include - #include "pygobject.h" #include "test-object.h" +#include +#include + static PyObject * _wrap_get_object (PyObject * self) {