libs/gst/controller/gstcontroller.h: fix ABI size-correction

Original commit message from CVS:
* libs/gst/controller/gstcontroller.h:
fix ABI size-correction
* tests/check/libs/gdp.c: (gst_dp_suite):
make tests that use deprecated API conditional

diff --git a/ChangeLog b/ChangeLog
index 1c62957..1e3bd46 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2006-08-10  Stefan Kost  <ensonic@users.sf.net>
 
+       * libs/gst/controller/gstcontroller.h:
+          fix ABI size-correction
+
+       * tests/check/libs/gdp.c: (gst_dp_suite):
+          make tests that use deprecated API conditional
+
+2006-08-10  Stefan Kost  <ensonic@users.sf.net>
+
        * docs/libs/gstreamer-libs-sections.txt:
        * libs/gst/controller/gstcontroller.c:
        (_gst_controller_get_property), (_gst_controller_set_property),

diff --git a/libs/gst/controller/gstcontroller.h b/libs/gst/controller/gstcontroller.h
index 2ffb16c..69e1b22 100644 (file)
--- a/libs/gst/controller/gstcontroller.h
+++ b/libs/gst/controller/gstcontroller.h
@@ -130,7 +130,7 @@ struct _GstController
 
   /*< private >*/
   GstControllerPrivate *priv;
-  gpointer       _gst_reserved[GST_PADDING - sizeof (GstControllerPrivate *)];
+  gpointer       _gst_reserved[GST_PADDING - 1];
 };
 
 struct _GstControllerClass

diff --git a/tests/check/libs/gdp.c b/tests/check/libs/gdp.c
index 866639e..a734a22 100644 (file)
--- a/tests/check/libs/gdp.c
+++ b/tests/check/libs/gdp.c
@@ -85,6 +85,8 @@ GST_START_TEST (test_conversion)
 
 GST_END_TEST;
 
+#ifndef GST_DISABLE_DEPRECATED  /* these tests use deprecated API, that we disable by default */
+
 #ifndef HAVE_CPU_PPC64          /* this test doesn't work on PPC64. See #348114 */
 
 /* test creation of header from buffer and back again */
@@ -150,7 +152,6 @@ GST_START_TEST (test_buffer)
 }
 
 GST_END_TEST;
-
 #endif
 
 GST_START_TEST (test_caps)
@@ -402,6 +403,8 @@ GST_START_TEST (test_memory)
 
 GST_END_TEST;
 
+#endif
+
 Suite *
 gst_dp_suite (void)
 {
@@ -410,12 +413,14 @@ gst_dp_suite (void)
 
   suite_add_tcase (s, tc_chain);
   tcase_add_test (tc_chain, test_conversion);
+#ifndef GST_DISABLE_DEPRECATED
 #ifndef HAVE_CPU_PPC64
   tcase_add_test (tc_chain, test_buffer);
 #endif
   tcase_add_test (tc_chain, test_caps);
   tcase_add_test (tc_chain, test_event);
   tcase_add_test (tc_chain, test_memory);
+#endif
 
   return s;
 }