diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-12-27 19:50:02 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-12-27 19:50:02 +0000 |
| commit | 1e4efb655493397dc19921a7a49281e789f9160c (patch) | |
| tree | 3ff4cc8e87d9fade825efdb7e48a984ae37b85eb | |
| parent | 97ffe020cdee9cec2f8c4591658ea72ee9e6d59e (diff) | |
| download | glib-1e4efb655493397dc19921a7a49281e789f9160c.tar.gz | |
Fix #316221, Michal Benes, Stanislav Brabec;
2005-12-27 Matthias Clasen <mclasen@redhat.com>
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().
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-12 | 7 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | glib/gthread.h | 2 |
5 files changed, 23 insertions, 2 deletions
@@ -1,5 +1,12 @@ 2005-12-27 Matthias Clasen <mclasen@redhat.com> + 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 3c1587583..75fa558ab 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,12 @@ 2005-12-27 Matthias Clasen <mclasen@redhat.com> + 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 3c1587583..75fa558ab 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,5 +1,12 @@ 2005-12-27 Matthias Clasen <mclasen@redhat.com> + 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 b4fae1bd0..c14fa49e1 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 1234ec768..2d0170e1b 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 */ |