Fix g_atomic_pointer_compare_and_exchange on sparc64. (#167572, Gert

2005-07-19  Matthias Clasen  <mclasen@redhat.com>

        * glib/gatomic.c (g_atomic_pointer_compare_and_exchange):
        Fix g_atomic_pointer_compare_and_exchange on sparc64.
        (#167572, Gert Doering)

diff --git a/ChangeLog b/ChangeLog
index 487a295..b037658 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-19  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gatomic.c (g_atomic_pointer_compare_and_exchange): 
+       Fix g_atomic_pointer_compare_and_exchange on sparc64.
+       (#167572, Gert Doering)
+
 2005-07-15  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 487a295..b037658 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-07-19  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gatomic.c (g_atomic_pointer_compare_and_exchange): 
+       Fix g_atomic_pointer_compare_and_exchange on sparc64.
+       (#167572, Gert Doering)
+
 2005-07-15  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 487a295..b037658 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2005-07-19  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gatomic.c (g_atomic_pointer_compare_and_exchange): 
+       Fix g_atomic_pointer_compare_and_exchange on sparc64.
+       (#167572, Gert Doering)
+
 2005-07-15  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 487a295..b037658 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2005-07-19  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gatomic.c (g_atomic_pointer_compare_and_exchange): 
+       Fix g_atomic_pointer_compare_and_exchange on sparc64.
+       (#167572, Gert Doering)
+
 2005-07-15  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version

diff --git a/glib/gatomic.c b/glib/gatomic.c
index 308486b..2f4f9b0 100644 (file)
--- a/glib/gatomic.c
+++ b/glib/gatomic.c
@@ -121,7 +121,7 @@ g_atomic_pointer_compare_and_exchange (gpointer *atomic,
                        : "=r" (result), "=m" (*a)
                        : "r" (oldval), "m" (*a), "r" (a),
                        "0" (newval));
-  return result != 0;
+  return result == oldval;
 }
 #  else /* What's that */
 #    error "Your system has an unsupported pointer size"