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().

diff --git a/ChangeLog b/ChangeLog
index 3c15875..75fa558 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 3c15875..75fa558 100644 (file)
--- 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 3c15875..75fa558 100644 (file)
--- 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 b4fae1b..c14fa49 100644 (file)
--- 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 1234ec7..2d0170e 100644 (file)
--- 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 */