projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ec6e452
)
gstobject: use the atomic macros to deal with the glib change in the impl.
author
Stefan Kost
<ensonic@users.sf.net>
Tue, 23 Aug 2011 09:41:02 +0000
(11:41 +0200)
committer
Stefan Kost
<ensonic@users.sf.net>
Tue, 23 Aug 2011 09:43:44 +0000
(11:43 +0200)
gst/gstobject.c
patch
|
blob
|
history
diff --git
a/gst/gstobject.c
b/gst/gstobject.c
index
8efadeb
..
f5a7769
100644
(file)
--- a/
gst/gstobject.c
+++ b/
gst/gstobject.c
@@
-84,6
+84,7
@@
*/
#include "gst_private.h"
+#include "glib-compat-private.h"
#include "gstobject.h"
#include "gstmarshal.h"
@@
-445,7
+446,7
@@
gst_object_replace (GstObject ** oldobj, GstObject * newobj)
g_object_ref (newobj);
do {
oldptr = *oldobj;
- } while (!
g_atomic_pointer_compare_and_exchange
((void *) oldobj,
+ } while (!
G_ATOMIC_POINTER_COMPARE_AND_EXCHANGE
((void *) oldobj,
oldptr, newobj));
if (oldptr)
g_object_unref (oldptr);