From f0ca338866b202bd4573777f9520072aef7f22fe Mon Sep 17 00:00:00 2001
From: Jan Schmidt <thaytan@mad.scientist.com>
Date: Sat, 12 Jan 2008 23:24:02 +0000
Subject: [PATCH] tests/check/Makefile.am: Fix CFLAGS to also pull in the
 gstcheck cflags from AM_CFLAGS.

Original commit message from CVS:
* tests/check/Makefile.am:
Fix CFLAGS to also pull in the gstcheck cflags from AM_CFLAGS.
* tests/check/elements/audiorate.c: (do_perfect_stream_test):
* tests/check/elements/playbin.c:
* tests/check/libs/mixer.c: (test_element_interface_supported),
(gst_implements_interface_init):
* tests/check/libs/rtp.c: (GST_START_TEST):
Fix various assignment type mismatches.
---
 ChangeLog                        | 12 ++++++++++++
 tests/check/Makefile.am          |  2 +-
 tests/check/elements/audiorate.c |  2 +-
 tests/check/elements/playbin.c   |  4 ++--
 tests/check/libs/mixer.c         |  5 +++--
 tests/check/libs/rtp.c           |  4 ++--
 6 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 82b51b1744..fcd1ffb5ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-01-12  Jan Schmidt  <Jan.Schmidt@sun.com>
+
+	* tests/check/Makefile.am:
+	Fix CFLAGS to also pull in the gstcheck cflags from AM_CFLAGS.
+
+	* tests/check/elements/audiorate.c: (do_perfect_stream_test):
+	* tests/check/elements/playbin.c:
+	* tests/check/libs/mixer.c: (test_element_interface_supported),
+	(gst_implements_interface_init):
+	* tests/check/libs/rtp.c: (GST_START_TEST):
+	Fix various assignment type mismatches.
+
 2008-01-12  Jan Schmidt  <Jan.Schmidt@sun.com>
 
 	* configure.ac:
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 82e54818fa..c52546ebbc 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -288,7 +288,7 @@ pipelines_vorbisdec_CFLAGS = $(AM_CFLAGS)
 pipelines_oggmux_LDADD = $(LDADD) $(OGG_LIBS)
 pipelines_oggmux_CFLAGS = $(AM_CFLAGS) $(OGG_CFLAGS)
 
-pipelines_theoraenc_CFLAGS = $(GST_CFLAGS) $(THEORA_CFLAGS)
+pipelines_theoraenc_CFLAGS = $(AM_CFLAGS) $(THEORA_CFLAGS)
 pipelines_theoraenc_LDADD = $(LDADD) $(THEORA_LIBS)
 
 pipelines_simple_launch_lines_CFLAGS = \
diff --git a/tests/check/elements/audiorate.c b/tests/check/elements/audiorate.c
index 7e7616c7da..97fe8c0516 100644
--- a/tests/check/elements/audiorate.c
+++ b/tests/check/elements/audiorate.c
@@ -191,7 +191,7 @@ do_perfect_stream_test (guint rate, guint width, gdouble drop_probability,
   GstPad *srcpad;
   GList *l, *bufs = NULL;
   GstClockTime next_time = GST_CLOCK_TIME_NONE;
-  gint64 next_offset = GST_BUFFER_OFFSET_NONE;
+  guint64 next_offset = GST_BUFFER_OFFSET_NONE;
 
   caps = gst_caps_new_simple ("audio/x-raw-int", "rate", G_TYPE_INT,
       rate, "width", G_TYPE_INT, width, NULL);
diff --git a/tests/check/elements/playbin.c b/tests/check/elements/playbin.c
index df7b782b15..043ccf91fe 100644
--- a/tests/check/elements/playbin.c
+++ b/tests/check/elements/playbin.c
@@ -378,7 +378,7 @@ DEFINE_TEST (test_missing_primary_decoder)
 
 /*** redvideo:// source ***/
 
-static guint
+static GstURIType
 gst_red_video_src_uri_get_type (void)
 {
   return GST_URI_SRC;
@@ -487,7 +487,7 @@ gst_red_video_src_init (GstRedVideoSrc * src, GstRedVideoSrcClass * klass)
 
 /*** codec:// source ***/
 
-static guint
+static GstURIType
 gst_codec_src_uri_get_type (void)
 {
   return GST_URI_SRC;
diff --git a/tests/check/libs/mixer.c b/tests/check/libs/mixer.c
index f94efb51f9..5de4c95db2 100644
--- a/tests/check/libs/mixer.c
+++ b/tests/check/libs/mixer.c
@@ -87,7 +87,8 @@ test_element_class_init (TestElementClass * klass)
 }
 
 static gboolean
-test_element_interface_supported (TestElement * this, GType interface_type)
+test_element_interface_supported (GstImplementsInterface * ifacE,
+    GType interface_type)
 {
   if (interface_type == GST_TYPE_MIXER)
     return TRUE;
@@ -98,7 +99,7 @@ test_element_interface_supported (TestElement * this, GType interface_type)
 static void
 gst_implements_interface_init (GstImplementsInterfaceClass * klass)
 {
-  klass->supported = (gpointer) test_element_interface_supported;
+  klass->supported = test_element_interface_supported;
 }
 
 static void
diff --git a/tests/check/libs/rtp.c b/tests/check/libs/rtp.c
index c6a5e8f697..82423d55e5 100644
--- a/tests/check/libs/rtp.c
+++ b/tests/check/libs/rtp.c
@@ -66,8 +66,8 @@ GST_START_TEST (test_rtp_buffer)
 
   /* check ssrc offset */
   gst_rtp_buffer_set_ssrc (buf, 0xf04043C2);
-  fail_unless_equals_int (gst_rtp_buffer_get_ssrc (buf), 0xf04043c2);
-  fail_unless_equals_int (GST_READ_UINT32_BE (data + 4 + 4), 0xf04043c2);
+  fail_unless_equals_int (gst_rtp_buffer_get_ssrc (buf), (gint) 0xf04043c2);
+  fail_unless_equals_int (GST_READ_UINT32_BE (data + 4 + 4), (gint) 0xf04043c2);
   gst_rtp_buffer_set_ssrc (buf, 0);
   fail_unless_equals_int (gst_rtp_buffer_get_ssrc (buf), 0);
   fail_unless_equals_int (GST_READ_UINT32_BE (data + 4 + 4), 0);