From: Matthias Clasen Date: Tue, 27 Dec 2005 19:50:02 +0000 (+0000) Subject: Fix #316221, Michal Benes, Stanislav Brabec; X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=1e4efb655493397dc19921a7a49281e789f9160c;p=dana%2Fcg-glib.git Fix #316221, Michal Benes, Stanislav Brabec; 2005-12-27 Matthias Clasen Fix #316221, Michal Benes, Stanislav Brabec; * configure.in: Fix a strict aliasing problem in g_static_mutex_get_mutex(). * glib/gthread.h: ...and in g_static_mutex_get_mutex_impl_shortcut(). --- diff --git a/ChangeLog b/ChangeLog index 3c158758..75fa558a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2005-12-27 Matthias Clasen + Fix #316221, Michal Benes, Stanislav Brabec; + + * configure.in: Fix a strict aliasing problem in + g_static_mutex_get_mutex(). + * glib/gthread.h: ...and in + g_static_mutex_get_mutex_impl_shortcut(). + * glib/gdatasetprivate.h: Add a cast to silence compiler warnings. (#321978, Andrew Paprocki) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3c158758..75fa558a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,12 @@ 2005-12-27 Matthias Clasen + Fix #316221, Michal Benes, Stanislav Brabec; + + * configure.in: Fix a strict aliasing problem in + g_static_mutex_get_mutex(). + * glib/gthread.h: ...and in + g_static_mutex_get_mutex_impl_shortcut(). + * glib/gdatasetprivate.h: Add a cast to silence compiler warnings. (#321978, Andrew Paprocki) diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 3c158758..75fa558a 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,5 +1,12 @@ 2005-12-27 Matthias Clasen + Fix #316221, Michal Benes, Stanislav Brabec; + + * configure.in: Fix a strict aliasing problem in + g_static_mutex_get_mutex(). + * glib/gthread.h: ...and in + g_static_mutex_get_mutex_impl_shortcut(). + * glib/gdatasetprivate.h: Add a cast to silence compiler warnings. (#321978, Andrew Paprocki) diff --git a/configure.in b/configure.in index b4fae1bd..c14fa49e 100644 --- a/configure.in +++ b/configure.in @@ -2358,7 +2358,7 @@ struct _GStaticMutex }; #define G_STATIC_MUTEX_INIT { NULL, { { $g_mutex_contents} } } #define g_static_mutex_get_mutex(mutex) \\ - (g_thread_use_default_impl ? ((GMutex*) &((mutex)->static_mutex)) : \\ + (g_thread_use_default_impl ? ((GMutex*) &((mutex)->static_mutex.pad)) : \\ g_static_mutex_get_mutex_impl_shortcut (&((mutex)->runtime_mutex))) _______EOF else diff --git a/glib/gthread.h b/glib/gthread.h index 1234ec76..2d0170e1 100644 --- a/glib/gthread.h +++ b/glib/gthread.h @@ -138,7 +138,7 @@ void g_thread_init_with_errorcheck_mutexes (GThreadFunctions* vtable); GMutex* g_static_mutex_get_mutex_impl (GMutex **mutex); #define g_static_mutex_get_mutex_impl_shortcut(mutex) \ - (g_atomic_pointer_get ((gpointer*)mutex) ? *(mutex) : \ + (g_atomic_pointer_get (mutex) ? *(mutex) : \ g_static_mutex_get_mutex_impl (mutex)) /* shorthands for conditional and unconditional function calls */