From 2af063c00e55fab433ae4083072eacd45cf0a3f4 Mon Sep 17 00:00:00 2001 From: Sebastian Wilhelmi Date: Mon, 1 Mar 2004 10:21:26 +0000 Subject: [PATCH] Define g_atomic_(int|pointer)_get only for 2004-03-01 Sebastian Wilhelmi * glib/gatomic.c: Define g_atomic_(int|pointer)_get only for G_ATOMIC_OP_MEMORY_BARRIER_NEEDED. Spotted by Hans Breuer. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gatomic.c | 4 +++- 7 files changed, 33 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index fa93b826a..f588b635f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-03-01 Sebastian Wilhelmi + + * glib/gatomic.c: Define g_atomic_(int|pointer)_get only for + G_ATOMIC_OP_MEMORY_BARRIER_NEEDED. Spotted by Hans Breuer. + Sun Feb 29 21:42:47 2004 Owen Taylor * glib/gmain.c: Fix leftover references to diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fa93b826a..f588b635f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2004-03-01 Sebastian Wilhelmi + + * glib/gatomic.c: Define g_atomic_(int|pointer)_get only for + G_ATOMIC_OP_MEMORY_BARRIER_NEEDED. Spotted by Hans Breuer. + Sun Feb 29 21:42:47 2004 Owen Taylor * glib/gmain.c: Fix leftover references to diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index fa93b826a..f588b635f 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2004-03-01 Sebastian Wilhelmi + + * glib/gatomic.c: Define g_atomic_(int|pointer)_get only for + G_ATOMIC_OP_MEMORY_BARRIER_NEEDED. Spotted by Hans Breuer. + Sun Feb 29 21:42:47 2004 Owen Taylor * glib/gmain.c: Fix leftover references to diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index fa93b826a..f588b635f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2004-03-01 Sebastian Wilhelmi + + * glib/gatomic.c: Define g_atomic_(int|pointer)_get only for + G_ATOMIC_OP_MEMORY_BARRIER_NEEDED. Spotted by Hans Breuer. + Sun Feb 29 21:42:47 2004 Owen Taylor * glib/gmain.c: Fix leftover references to diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index fa93b826a..f588b635f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2004-03-01 Sebastian Wilhelmi + + * glib/gatomic.c: Define g_atomic_(int|pointer)_get only for + G_ATOMIC_OP_MEMORY_BARRIER_NEEDED. Spotted by Hans Breuer. + Sun Feb 29 21:42:47 2004 Owen Taylor * glib/gmain.c: Fix leftover references to diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index fa93b826a..f588b635f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2004-03-01 Sebastian Wilhelmi + + * glib/gatomic.c: Define g_atomic_(int|pointer)_get only for + G_ATOMIC_OP_MEMORY_BARRIER_NEEDED. Spotted by Hans Breuer. + Sun Feb 29 21:42:47 2004 Owen Taylor * glib/gmain.c: Fix leftover references to diff --git a/glib/gatomic.c b/glib/gatomic.c index cf3de33eb..e950836e2 100644 --- a/glib/gatomic.c +++ b/glib/gatomic.c @@ -530,6 +530,7 @@ g_atomic_pointer_compare_and_exchange (gpointer *atomic, return result; } +#ifdef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED gint g_atomic_int_get (gint *atomic) { @@ -552,7 +553,8 @@ g_atomic_pointer_get (gpointer *atomic) G_UNLOCK (g_atomic_lock); return result; -} +} +#endif /* G_ATOMIC_OP_MEMORY_BARRIER_NEEDED */ #elif defined (G_ATOMIC_OP_MEMORY_BARRIER_NEEDED) gint g_atomic_int_get (gint *atomic)