clock: Fix deprecation handling of the GstClock clock field

diff --git a/gst/gstclock.c b/gst/gstclock.c
index 007ceed..baa6286 100644 (file)
--- a/gst/gstclock.c
+++ b/gst/gstclock.c
@@ -249,8 +249,12 @@ gst_clock_entry_new (GstClock * clock, GstClockTime time,
       "created entry %p, time %" GST_TIME_FORMAT, entry, GST_TIME_ARGS (time));
 
   entry->refcount = 1;
+#ifndef GST_REMOVE_DEPRECATED
 #ifndef GST_DISABLE_DEPRECATED
   entry->clock = clock;
+#else
+  entry->_clock = clock;
+#endif
 #endif
   g_weak_ref_init (&entry->ABI.clock, clock);
   entry->type = type;

diff --git a/gst/gstclock.h b/gst/gstclock.h
index d21aedd..317f44a 100644 (file)
--- a/gst/gstclock.h
+++ b/gst/gstclock.h
@@ -392,8 +392,12 @@ typedef enum {
 struct _GstClockEntry {
   gint                  refcount;
   /*< protected >*/
+#ifndef GST_REMOVE_DEPRECATED
 #ifndef GST_DISABLE_DEPRECATED
   GstClock              *clock;
+#else
+  gpointer               _clock;
+#endif
 #endif
   GstClockEntryType      type;
   GstClockTime           time;