From 04deaac7a49d19c830f98614e209240b2c953717 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 26 Aug 2018 00:34:44 +0200 Subject: [PATCH] check: testclock: fix deprecation guards Make our own deprecation marker for libgstcheck, since the function declaration must contain the right API export decorator (GST_CHECK_API) and not the one for GStreamer core. --- libs/gst/check/check-prelude.h | 8 ++++++++ libs/gst/check/gsttestclock.h | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libs/gst/check/check-prelude.h b/libs/gst/check/check-prelude.h index 6bf1366..bb05c11 100644 --- a/libs/gst/check/check-prelude.h +++ b/libs/gst/check/check-prelude.h @@ -28,4 +28,12 @@ #define GST_CHECK_API GST_EXPORT #endif +#ifndef GST_DISABLE_DEPRECATED +#define GST_CHECK_DEPRECATED GST_CHECK_API +#define GST_CHECK_DEPRECATED_FOR(f) GST_CHECK_API +#else +#define GST_CHECK_DEPRECATED G_DEPRECATED GST_CHECK_API +#define GST_CHECK_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f) GST_CHECK_API +#endif + #endif /* __GST_CHECK_PRELUDE_H__ */ diff --git a/libs/gst/check/gsttestclock.h b/libs/gst/check/gsttestclock.h index ac2219f..ee1afd0 100644 --- a/libs/gst/check/gsttestclock.h +++ b/libs/gst/check/gsttestclock.h @@ -106,7 +106,7 @@ GST_CHECK_API void gst_test_clock_wait_for_next_pending_id (GstTestClock * test_clock, GstClockID * pending_id); -GST_DEPRECATED_FOR(gst_test_clock_wait_for_multiple_pending_ids) +GST_CHECK_DEPRECATED_FOR(gst_test_clock_wait_for_multiple_pending_ids) void gst_test_clock_wait_for_pending_id_count (GstTestClock * test_clock, guint count); -- 2.7.4