try again

This commit is contained in:
Matthias Clasen 2007-07-13 02:24:09 +00:00
parent 600fbb07fe
commit 7e27575d87

View File

@ -6,21 +6,21 @@ diff -up glib-2.13.7/glib/gthread.c.ppc-cast glib-2.13.7/glib/gthread.c
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 (g_atomic_pointer_get ((gpointer*) 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_atomic_pointer_set ((gpointer*) value_location, (gpointer) initialization_value);
g_mutex_lock (g_once_mutex);
g_once_init_list = g_slist_remove (g_once_init_list, (void*) value_location);
g_once_init_list = g_slist_remove (g_once_init_list, (gpointer*) value_location);
g_cond_broadcast (g_once_cond);
@@ -255,7 +255,7 @@ g_static_mutex_get_mutex_impl (GMutex**
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_atomic_pointer_set ((gpointer*) mutex, g_mutex_new());
g_mutex_unlock (g_once_mutex);
@ -32,7 +32,7 @@ diff -up glib-2.13.7/glib/gthread.h.ppc-cast glib-2.13.7/glib/gthread.h
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)
+ if G_LIKELY (g_atomic_pointer_get ((gpointer*) value_location) !=0)
return FALSE;
else
return g_once_init_enter_impl (value_location);