From e16ec3b9736e0641b059422a0e4b357ab84b681b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 5 Jan 2006 14:30:04 +0000 Subject: [PATCH] Fix another strict aliasing problem. 2006-01-05 Matthias Clasen * configure.in: Fix another strict aliasing problem. --- ChangeLog | 2 ++ ChangeLog.pre-2-10 | 2 ++ ChangeLog.pre-2-12 | 2 ++ configure.in | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7da25b462..383648a4c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2006-01-05 Matthias Clasen + * 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 7da25b462..383648a4c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,7 @@ 2006-01-05 Matthias Clasen + * 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 7da25b462..383648a4c 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,5 +1,7 @@ 2006-01-05 Matthias Clasen + * 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 ba33ea543..0e4a0987d 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.pad)) : \\ + (g_thread_use_default_impl ? ((GMutex*) ((mutex)->static_mutex.pad)) : \\ g_static_mutex_get_mutex_impl_shortcut (&((mutex)->runtime_mutex))) _______EOF else