fixed missing pointer casts when using atomic ops.

Fri Jul 13 00:50:40 2007  Tim Janik  <timj@imendio.com>

        * glib/gthread.[hc]: fixed missing pointer casts when using atomic ops.

svn path=/trunk/; revision=5637

diff --git a/ChangeLog b/ChangeLog
index edea2e36f23fd279fa88acae6ad073120a6edb55..f0ec3ad12c325eb8a4e9831f5744743abdf19a3b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jul 13 00:50:40 2007  Tim Janik  <timj@imendio.com>
+
+       * glib/gthread.[hc]: fixed missing pointer casts when using atomic ops.
+
 2007-07-12  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version

diff --git a/glib/gthread.c b/glib/gthread.c
index e040524f9aaec3b23a2be7e28f0931b7a199cbfd..72ec8ee00576c72a6be0179f69e84ab2bdc7465f 100644 (file)
--- a/glib/gthread.c
+++ b/glib/gthread.c
@@ -223,11 +223,11 @@ void
 g_once_init_leave (volatile gsize *value_location,
                    gsize           initialization_value)
 {
-  g_return_if_fail (g_atomic_pointer_get (value_location) == 0);
+  g_return_if_fail (g_atomic_pointer_get ((void*) value_location) == 0);
   g_return_if_fail (initialization_value != 0);
   g_return_if_fail (g_once_init_list != NULL);
 
-  g_atomic_pointer_set (value_location, initialization_value);
+  g_atomic_pointer_set ((void*) value_location, (void*) initialization_value);
   g_mutex_lock (g_once_mutex);
   g_once_init_list = g_slist_remove (g_once_init_list, (void*) value_location);
   g_cond_broadcast (g_once_cond);
@@ -255,7 +255,7 @@ g_static_mutex_get_mutex_impl (GMutex** mutex)
   g_mutex_lock (g_once_mutex);
 
   if (!(*mutex))
-    g_atomic_pointer_set (mutex, g_mutex_new());
+    g_atomic_pointer_set ((void*) mutex, g_mutex_new());
 
   g_mutex_unlock (g_once_mutex);
 

diff --git a/glib/gthread.h b/glib/gthread.h
index 2076185e3b2f8a9b8154cac8c1df1befbac34af4..6ccc9649fc4aa7f20d4afa7e22a66b88bb138783 100644 (file)
--- a/glib/gthread.h
+++ b/glib/gthread.h
@@ -332,7 +332,7 @@ void                    g_once_init_leave       (volatile gsize *value_location,
 G_INLINE_FUNC gboolean
 g_once_init_enter (volatile gsize *value_location)
 {
-  if G_LIKELY (g_atomic_pointer_get (value_location) !=0)
+  if G_LIKELY (g_atomic_pointer_get ((void*) value_location) !=0)
     return FALSE;
   else
     return g_once_init_enter_impl (value_location);