From 62510425df90bddd2c688fd284347775de3b4702 Mon Sep 17 00:00:00 2001 From: Sven Herzberg Date: Mon, 13 Oct 2008 12:54:13 +0000 Subject: [PATCH] =?UTF-8?q?Bug=20556101=20=E2=80=93=20static=20mutex=20yie?= =?UTF-8?q?lds=20warnings=20with=20g++=20Reviewed=20by=20Tim=20Janik?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2008-10-13 Sven Herzberg Bug 556101 – static mutex yields warnings with g++ Reviewed by Tim Janik * configure.in: added an intermediate cast to gpointer svn path=/trunk/; revision=7598 --- ChangeLog | 7 +++++++ configure.in | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2183326da..b7b57fa93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-10-13 Sven Herzberg + + Bug 556101 – static mutex yields warnings with g++ + Reviewed by Tim Janik + + * configure.in: added an intermediate cast to gpointer + 2008-10-13 Christian Persch Bug 555311 – format not a string literal and no format arguments diff --git a/configure.in b/configure.in index 095acac8d..5f57c8ea3 100644 --- a/configure.in +++ b/configure.in @@ -2892,7 +2892,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*)(gpointer) ((mutex)->static_mutex.pad)) : \\ g_static_mutex_get_mutex_impl_shortcut (&((mutex)->runtime_mutex))) _______EOF else