From 876f4e4722fc48af9d0ce8938fe646c53353380c Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Thu, 10 Aug 2006 20:05:30 +0000 Subject: [PATCH] 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 --- ChangeLog | 8 ++++++++ libs/gst/controller/gstcontroller.h | 2 +- tests/check/libs/gdp.c | 7 ++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1c62957030..1e3bd46089 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-08-10 Stefan Kost + + * 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 * docs/libs/gstreamer-libs-sections.txt: diff --git a/libs/gst/controller/gstcontroller.h b/libs/gst/controller/gstcontroller.h index 2ffb16c279..69e1b22c54 100644 --- 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 866639e149..a734a22206 100644 --- 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; }