summaryrefslogtreecommitdiff
path: root/gst/gstpoll.c
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim.muller@collabora.co.uk>2012-01-22 01:25:22 +0000
committerTim-Philipp Müller <tim.muller@collabora.co.uk>2012-01-22 01:25:22 +0000
commit13d91d1f6c63d2010c561bd54f1e6f68a0a745b5 (patch)
tree11cac36a2c86b5152669d8f3a57e23afce280495 /gst/gstpoll.c
parent612abd89ddcbe41d55e5de66411e0159f7d85156 (diff)
Use recent GLib API unconditionally now that we depend on the latest GLib
Diffstat (limited to 'gst/gstpoll.c')
-rw-r--r--gst/gstpoll.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/gst/gstpoll.c b/gst/gstpoll.c
index 3236085fd..e68b14a23 100644
--- a/gst/gstpoll.c
+++ b/gst/gstpoll.c
@@ -160,8 +160,8 @@ static gboolean gst_poll_add_fd_unlocked (GstPoll * set, GstPollFD * fd);
#define IS_FLUSHING(s) (g_atomic_int_get(&(s)->flushing))
#define SET_FLUSHING(s,val) (g_atomic_int_set(&(s)->flushing, (val)))
-#define INC_WAITING(s) (G_ATOMIC_INT_ADD(&(s)->waiting, 1))
-#define DEC_WAITING(s) (G_ATOMIC_INT_ADD(&(s)->waiting, -1))
+#define INC_WAITING(s) (g_atomic_int_add(&(s)->waiting, 1))
+#define DEC_WAITING(s) (g_atomic_int_add(&(s)->waiting, -1))
#define GET_WAITING(s) (g_atomic_int_get(&(s)->waiting))
#define TEST_REBUILD(s) (g_atomic_int_compare_and_exchange(&(s)->rebuild, 1, 0))
@@ -182,7 +182,7 @@ raise_wakeup (GstPoll * set)
{
gboolean result = TRUE;
- if (G_ATOMIC_INT_ADD (&set->control_pending, 1) == 0) {
+ if (g_atomic_int_add (&set->control_pending, 1) == 0) {
/* raise when nothing pending */
GST_LOG ("%p: raise", set);
result = WAKE_EVENT (set);
@@ -222,7 +222,7 @@ release_all_wakeup (GstPoll * set)
break;
else
/* retry again until we read it successfully */
- G_ATOMIC_INT_ADD (&set->control_pending, 1);
+ g_atomic_int_add (&set->control_pending, 1);
}
}
return old;