From 95e5ffb69509f221b41e097a4b68cf1922c1139c Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Thu, 12 Jul 2007 23:03:06 +0000 Subject: [PATCH] more atomic ops pointer cast fixes. this time it'll work with atomic op Fri Jul 13 01:01:46 2007 Tim Janik * glib/gthread.[hc]: more atomic ops pointer cast fixes. this time it'll work with atomic op macros *and* atomic op functions. svn path=/trunk/; revision=5638 --- ChangeLog | 5 +++++ glib/gthread.c | 6 +++--- glib/gthread.h | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f0ec3ad..837d14d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jul 13 01:01:46 2007 Tim Janik + + * glib/gthread.[hc]: more atomic ops pointer cast fixes. this time it'll + work with atomic op macros *and* atomic op functions. + Fri Jul 13 00:50:40 2007 Tim Janik * glib/gthread.[hc]: fixed missing pointer casts when using atomic ops. diff --git a/glib/gthread.c b/glib/gthread.c index 72ec8ee..fe9f25d 100644 --- 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 ((void*) 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 ((void*) 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); @@ -255,7 +255,7 @@ g_static_mutex_get_mutex_impl (GMutex** mutex) g_mutex_lock (g_once_mutex); if (!(*mutex)) - g_atomic_pointer_set ((void*) 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 6ccc964..3aaf14e 100644 --- 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 ((void*) 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); -- 2.7.4