Define g_atomic_(int|pointer)_get only for

2004-03-01  Sebastian Wilhelmi  <seppi@seppi.de>

	* glib/gatomic.c: Define g_atomic_(int|pointer)_get only for
	G_ATOMIC_OP_MEMORY_BARRIER_NEEDED. Spotted by Hans Breuer.

diff --git a/ChangeLog b/ChangeLog
index fa93b82..f588b63 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-01  Sebastian Wilhelmi  <seppi@seppi.de>
+
+       * 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  <otaylor@redhat.com>
 
        * glib/gmain.c: Fix leftover references to 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fa93b82..f588b63 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-03-01  Sebastian Wilhelmi  <seppi@seppi.de>
+
+       * 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  <otaylor@redhat.com>
 
        * glib/gmain.c: Fix leftover references to 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index fa93b82..f588b63 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2004-03-01  Sebastian Wilhelmi  <seppi@seppi.de>
+
+       * 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  <otaylor@redhat.com>
 
        * glib/gmain.c: Fix leftover references to 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index fa93b82..f588b63 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2004-03-01  Sebastian Wilhelmi  <seppi@seppi.de>
+
+       * 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  <otaylor@redhat.com>
 
        * glib/gmain.c: Fix leftover references to 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index fa93b82..f588b63 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-03-01  Sebastian Wilhelmi  <seppi@seppi.de>
+
+       * 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  <otaylor@redhat.com>
 
        * glib/gmain.c: Fix leftover references to 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fa93b82..f588b63 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-03-01  Sebastian Wilhelmi  <seppi@seppi.de>
+
+       * 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  <otaylor@redhat.com>
 
        * glib/gmain.c: Fix leftover references to 

diff --git a/glib/gatomic.c b/glib/gatomic.c
index cf3de33..e950836 100644 (file)
--- 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)