Fix various inconsistencies discovered while attempting to fix --disable-*.

Original commit message from CVS:
Fix various inconsistencies discovered while attempting to fix --disable-*.
Uraeus: this should fix the bison.simple problem that you've had.

diff --git a/gst/autoplug/autoplugtest.c b/gst/autoplug/autoplugtest.c
index 4fdd5dc..c269a72 100644 (file)
--- a/gst/autoplug/autoplugtest.c
+++ b/gst/autoplug/autoplugtest.c
@@ -1,4 +1,5 @@
 #include <gst/gst.h>
+#include <stdlib.h>
 #include <string.h>
 
 GstElement *pipeline, *src, *autobin, *cache, *typefind, *decoder, *sink;

diff --git a/gst/elements/gstfakesrc.c b/gst/elements/gstfakesrc.c
index ca9eb42..a6141b4 100644 (file)
--- a/gst/elements/gstfakesrc.c
+++ b/gst/elements/gstfakesrc.c
@@ -153,7 +153,7 @@ gst_fakesrc_filltype_get_type (void)
 static void            gst_fakesrc_class_init          (GstFakeSrcClass *klass);
 static void            gst_fakesrc_init                (GstFakeSrc *fakesrc);
 
-static GstPad*                 gst_fakesrc_request_new_pad     (GstElement *element, GstPadTemplate *templ);
+static GstPad*                 gst_fakesrc_request_new_pad     (GstElement *element, GstPadTemplate *templ,const gchar *unused);
 static void            gst_fakesrc_update_functions    (GstFakeSrc *src);
 static void            gst_fakesrc_set_property        (GObject *object, guint prop_id, 
                                                         const GValue *value, GParamSpec *pspec);
@@ -293,7 +293,7 @@ gst_fakesrc_init (GstFakeSrc *fakesrc)
 }
 
 static GstPad*
-gst_fakesrc_request_new_pad (GstElement *element, GstPadTemplate *templ)
+gst_fakesrc_request_new_pad (GstElement *element, GstPadTemplate *templ, const gchar *unused)
 {
   gchar *name;
   GstPad *srcpad;

diff --git a/gst/gstbin.c b/gst/gstbin.c
index ab58c58..a8208df 100644 (file)
--- a/gst/gstbin.c
+++ b/gst/gstbin.c
@@ -49,7 +49,7 @@ static void                   gst_bin_dispose                 (GObject * object);
 static GstElementStateReturn   gst_bin_change_state            (GstElement *element);
 static GstElementStateReturn   gst_bin_change_state_norecurse  (GstBin *bin);
 
-static void                    gst_bin_set_index               (GstBin *bin, GstIndex *index);
+static void                    gst_bin_set_index               (GstElement *element, GstIndex *index);
 
 static void                    gst_bin_add_func                (GstBin *bin, GstElement *element);
 static void                    gst_bin_remove_func             (GstBin *bin, GstElement *element);
@@ -224,9 +224,10 @@ gst_bin_auto_clock (GstBin *bin)
 }
 
 static void
-gst_bin_set_index (GstBin *bin, GstIndex *index)
+gst_bin_set_index (GstElement *element, GstIndex *index)
 {
   GList *children;
+  GstBin *bin = GST_BIN (element);
   
   g_return_if_fail (GST_IS_BIN (bin));
 

diff --git a/gst/parse/grammar.y b/gst/parse/grammar.y
index f99997b..a86531a 100644 (file)
--- a/gst/parse/grammar.y
+++ b/gst/parse/grammar.y
@@ -2,6 +2,7 @@
 #include <glib.h>
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 #include "../gstparse.h"
 #include "types.h"
 

diff --git a/gst/schedulers/gstbasicscheduler.c b/gst/schedulers/gstbasicscheduler.c
index 505ea9c..492de4d 100644 (file)
--- a/gst/schedulers/gstbasicscheduler.c
+++ b/gst/schedulers/gstbasicscheduler.c
@@ -265,8 +265,8 @@ GstPluginDesc plugin_desc = {
   plugin_init
 };
 
-static int
-gst_basic_scheduler_loopfunc_wrapper (int argc, char *argv[])
+static void
+gst_basic_scheduler_loopfunc_wrapper (int argc, void **argv)
 {
   GstElement *element = GST_ELEMENT_CAST (argv);
   G_GNUC_UNUSED const gchar *name = GST_ELEMENT_NAME (element);
@@ -294,11 +294,10 @@ gst_basic_scheduler_loopfunc_wrapper (int argc, char *argv[])
 
   GST_DEBUG_LEAVE ("(%d,'%s')", argc, name);
   gst_object_unref (GST_OBJECT (element));
-  return 0;
 }
 
-static int
-gst_basic_scheduler_chain_wrapper (int argc, char *argv[])
+static void
+gst_basic_scheduler_chain_wrapper (int argc, void **argv)
 {
   GstElement *element = GST_ELEMENT_CAST (argv);
   G_GNUC_UNUSED const gchar *name = GST_ELEMENT_NAME (element);
@@ -357,11 +356,10 @@ gst_basic_scheduler_chain_wrapper (int argc, char *argv[])
 
   GST_DEBUG_LEAVE ("(%d,'%s')", argc, name);
   gst_object_unref (GST_OBJECT (element));
-  return 0;
 }
 
-static int
-gst_basic_scheduler_src_wrapper (int argc, char *argv[])
+static void
+gst_basic_scheduler_src_wrapper (int argc, void **argv)
 {
   GstElement *element = GST_ELEMENT_CAST (argv);
   GList *pads;
@@ -383,7 +381,7 @@ gst_basic_scheduler_src_wrapper (int argc, char *argv[])
       pads = g_list_next (pads);
       if (GST_RPAD_DIRECTION (realpad) == GST_PAD_SRC && GST_PAD_IS_USABLE (realpad)) {
        GST_DEBUG (GST_CAT_DATAFLOW, "calling _getfunc for %s:%s", GST_DEBUG_PAD_NAME (realpad));
-       g_return_val_if_fail (GST_RPAD_GETFUNC (realpad) != NULL, 0);
+       g_return_if_fail (GST_RPAD_GETFUNC (realpad) != NULL);
        buf = GST_RPAD_GETFUNC (realpad) (GST_PAD_CAST (realpad));
        if (buf) {
          GST_DEBUG (GST_CAT_DATAFLOW, "calling gst_pad_push on pad %s:%s %p",
@@ -403,7 +401,6 @@ gst_basic_scheduler_src_wrapper (int argc, char *argv[])
   SCHED (element)->current = NULL;
 
   GST_DEBUG_LEAVE ("");
-  return 0;
 }
 
 static void

diff --git a/plugins/elements/gstfakesrc.c b/plugins/elements/gstfakesrc.c
index ca9eb42..a6141b4 100644 (file)
--- a/plugins/elements/gstfakesrc.c
+++ b/plugins/elements/gstfakesrc.c
@@ -153,7 +153,7 @@ gst_fakesrc_filltype_get_type (void)
 static void            gst_fakesrc_class_init          (GstFakeSrcClass *klass);
 static void            gst_fakesrc_init                (GstFakeSrc *fakesrc);
 
-static GstPad*                 gst_fakesrc_request_new_pad     (GstElement *element, GstPadTemplate *templ);
+static GstPad*                 gst_fakesrc_request_new_pad     (GstElement *element, GstPadTemplate *templ,const gchar *unused);
 static void            gst_fakesrc_update_functions    (GstFakeSrc *src);
 static void            gst_fakesrc_set_property        (GObject *object, guint prop_id, 
                                                         const GValue *value, GParamSpec *pspec);
@@ -293,7 +293,7 @@ gst_fakesrc_init (GstFakeSrc *fakesrc)
 }
 
 static GstPad*
-gst_fakesrc_request_new_pad (GstElement *element, GstPadTemplate *templ)
+gst_fakesrc_request_new_pad (GstElement *element, GstPadTemplate *templ, const gchar *unused)
 {
   gchar *name;
   GstPad *srcpad;