diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-09-23 18:02:04 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-09-23 18:02:04 +0200 |
| commit | 337275917f5a0d601e75b81a31716cd9283e28c4 (patch) | |
| tree | 441dad7c0f7dc62bebfdd417e9f71d597c8834d1 /recipes/glib-2.0 | |
| parent | 9f601f09c8b4ca7c294db17ae14ea01e269d7f05 (diff) | |
glib 2.0: add patch to work around bug #556515
Diffstat (limited to 'recipes/glib-2.0')
| -rw-r--r-- | recipes/glib-2.0/glib-2.0-2.21.6/bug-556515.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/recipes/glib-2.0/glib-2.0-2.21.6/bug-556515.patch b/recipes/glib-2.0/glib-2.0-2.21.6/bug-556515.patch new file mode 100644 index 0000000000..b03a0afb3f --- /dev/null +++ b/recipes/glib-2.0/glib-2.0-2.21.6/bug-556515.patch @@ -0,0 +1,34 @@ +--- /tmp/gobject.c 2009-09-23 10:02:19.000000000 +0200 ++++ glib-2.21.6/gobject/gobject.c 2009-09-23 14:52:46.000000000 +0200 +@@ -2377,14 +2376,15 @@ + + /* here we want to atomically do: if (ref_count>1) { ref_count--; return; } */ + retry_atomic_decrement1: +- old_ref = g_atomic_int_get (&object->ref_count); ++ old_ref = g_atomic_int_get ((int *)&object->ref_count); + if (old_ref > 1) + { ++ gboolean do_toggle_ref_notify = (old_ref == 2 && OBJECT_HAS_TOGGLE_REF (object)); + if (!g_atomic_int_compare_and_exchange ((int *)&object->ref_count, old_ref, old_ref - 1)) + goto retry_atomic_decrement1; + + /* if we went from 2->1 we need to notify toggle refs if any */ +- if (old_ref == 2 && OBJECT_HAS_TOGGLE_REF (object)) ++ if (do_toggle_ref_notify) + toggle_refs_notify (object, TRUE); + } + else +@@ -2397,11 +2397,12 @@ + old_ref = g_atomic_int_get ((int *)&object->ref_count); + if (old_ref > 1) + { ++ gboolean do_toggle_ref_notify = (old_ref == 2 && OBJECT_HAS_TOGGLE_REF (object)); + if (!g_atomic_int_compare_and_exchange ((int *)&object->ref_count, old_ref, old_ref - 1)) + goto retry_atomic_decrement2; + + /* if we went from 2->1 we need to notify toggle refs if any */ +- if (old_ref == 2 && OBJECT_HAS_TOGGLE_REF (object)) ++ if (do_toggle_ref_notify) + toggle_refs_notify (object, TRUE); + + return; |