mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-04 22:48:54 +00:00
Code Issues 1 Projects Releases Wiki Activity

gstclock: Fix ABI breakage on 32 bit architectures

Browse source 
The padding of GstClock is a GstClockTime and not a
gpointer, so adding a pointer requires the padding
size to be changed depending on the pointer size.
Use an union instead.

Fixes bug #582878.
This commit is contained in:
Sebastian Dröge 2009-05-17 10:46:39 +02:00
parent f2890f46a5
commit 44ea1ac6b4
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gst/gstclock.c
View file

@ -140,13 +140,13 @@ struct _GstClockPrivate
/* seqlocks */
#define read_seqbegin(clock) \
g_atomic_int_get (&clock->priv->post_count);
g_atomic_int_get (&clock->ABI.priv->post_count);
static inline gboolean
read_seqretry (GstClock * clock, gint seq)
{
/* no retry if the seqnum did not change */
if (G_LIKELY (seq == g_atomic_int_get (&clock->priv->pre_count)))
if (G_LIKELY (seq == g_atomic_int_get (&clock->ABI.priv->pre_count)))
return FALSE;
/* wait for the writer to finish and retry */
@ -158,12 +158,12 @@ read_seqretry (GstClock * clock, gint seq)
#define write_seqlock(clock) \
G_STMT_START { \
GST_OBJECT_LOCK (clock); \
g_atomic_int_inc (&clock->priv->pre_count); \
g_atomic_int_inc (&clock->ABI.priv->pre_count); \
} G_STMT_END;
#define write_sequnlock(clock) \
G_STMT_START { \
g_atomic_int_inc (&clock->priv->post_count); \
g_atomic_int_inc (&clock->ABI.priv->post_count); \
GST_OBJECT_UNLOCK (clock); \
} G_STMT_END;
@ -607,7 +607,7 @@ gst_clock_init (GstClock * clock)
clock->entries_changed = g_cond_new ();
clock->stats = FALSE;
clock->priv =
clock->ABI.priv =
G_TYPE_INSTANCE_GET_PRIVATE (clock, GST_TYPE_CLOCK, GstClockPrivate);
clock->internal_calibration = 0;

7
gst/gstclock.h
View file

@ -448,9 +448,10 @@ struct _GstClock {
GstClockID clockid;
/*< private >*/
GstClockPrivate *priv;
GstClockTime _gst_reserved[GST_PADDING-1];
union {
GstClockPrivate *priv;
GstClockTime _gst_reserved[GST_PADDING];
} ABI;
};
/**