check: testclock: fix deprecation guards
authorTim-Philipp Müller <tim@centricular.com>
Sat, 25 Aug 2018 22:34:44 +0000 (00:34 +0200)
committerTim-Philipp Müller <tim@centricular.com>
Sun, 26 Aug 2018 09:45:58 +0000 (11:45 +0200)
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
libs/gst/check/gsttestclock.h

index 6bf1366..bb05c11 100644 (file)
 #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__ */
index ac2219f..ee1afd0 100644 (file)
@@ -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);