Bug 556101 – static mutex yields warnings with g++ Reviewed by Tim Janik

2008-10-13  Sven Herzberg  <sven@imendio.com>

	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

diff --git a/ChangeLog b/ChangeLog
index 2183326..b7b57fa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-13  Sven Herzberg  <sven@imendio.com>
+
+       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 <chpe@gnome.org>
 
        Bug 555311 – format not a string literal and no format arguments

diff --git a/configure.in b/configure.in
index 095acac..5f57c8e 100644 (file)
--- 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