Add a necessary cast back. Pointed out by Kazuki Iwamoto.

        * glib/gthread.c (g_once_init_leave): Add a necessary cast back.
        Pointed out by Kazuki Iwamoto.

svn path=/trunk/; revision=7895

diff --git a/ChangeLog b/ChangeLog
index 705f77a..0f3bfc6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-22  Matthias Clasen  <mclasen@redhat.com>
+
+       Bug 572672 – glib/gthread.c: argument is different type
+
+       * glib/gthread.c (g_once_init_leave): Add a necessary cast back.
+       Pointed out by Kazuki Iwamoto.
+
 2009-02-17  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version

diff --git a/glib/gthread.c b/glib/gthread.c
index 78c7ae5..e26d3b3 100644 (file)
--- a/glib/gthread.c
+++ b/glib/gthread.c
@@ -228,7 +228,7 @@ g_once_init_leave (volatile gsize *value_location,
   g_return_if_fail (initialization_value != 0);
   g_return_if_fail (g_once_init_list != NULL);
 
-  g_atomic_pointer_set (value_location, (void*) 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);