Fix another strict aliasing problem.

2006-01-05  Matthias Clasen  <mclasen@redhat.com>

	* configure.in: Fix another strict aliasing problem.

diff --git a/ChangeLog b/ChangeLog
index 7da25b462c5fb425ed850d03b8f22064f1744305..383648a4c20e352e61bcbb84f5382a4cfdd47441 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-01-05  Matthias Clasen  <mclasen@redhat.com>
 
+       * configure.in: Fix another strict aliasing problem.
+
        * glib/gthreadpool.c: Avoid use of varargs macro.  (#325864,
        Kazuki IWAMOTO)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7da25b462c5fb425ed850d03b8f22064f1744305..383648a4c20e352e61bcbb84f5382a4cfdd47441 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,7 @@
 2006-01-05  Matthias Clasen  <mclasen@redhat.com>
 
+       * configure.in: Fix another strict aliasing problem.
+
        * glib/gthreadpool.c: Avoid use of varargs macro.  (#325864,
        Kazuki IWAMOTO)
 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 7da25b462c5fb425ed850d03b8f22064f1744305..383648a4c20e352e61bcbb84f5382a4cfdd47441 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,5 +1,7 @@
 2006-01-05  Matthias Clasen  <mclasen@redhat.com>
 
+       * configure.in: Fix another strict aliasing problem.
+
        * glib/gthreadpool.c: Avoid use of varargs macro.  (#325864,
        Kazuki IWAMOTO)
 

diff --git a/configure.in b/configure.in
index ba33ea543d98c4835989e50fa1041b1b28348f8b..0e4a0987d95a6b0862e9410716580f6555cef36c 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.pad)) : \\
+  (g_thread_use_default_impl ? ((GMutex*) ((mutex)->static_mutex.pad)) : \\
    g_static_mutex_get_mutex_impl_shortcut (&((mutex)->runtime_mutex)))
 _______EOF
        else