[maemo-commits] [maemo-commits] r16386 - projects/haf/trunk/glib

[From: subversion at stage.maemo.org]

Author: herzi
Date: 2008-10-13 16:06:09 +0300 (Mon, 13 Oct 2008)
New Revision: 16386

Modified:
   projects/haf/trunk/glib/ChangeLog
   projects/haf/trunk/glib/configure.in
Log:
2008-10-13  Sven Herzberg  <sven at imendio.com>

	Bug 556101 ?\226?\128?\147 static mutex yields warnings with g++
	Reviewed by Tim Janik

	* configure.in: added an intermediate cast to gpointer



Modified: projects/haf/trunk/glib/ChangeLog
===================================================================
--- projects/haf/trunk/glib/ChangeLog	2008-10-10 16:12:59 UTC (rev 16385)
+++ projects/haf/trunk/glib/ChangeLog	2008-10-13 13:06:09 UTC (rev 16386)
@@ -1,3 +1,10 @@
+2008-10-13  Sven Herzberg  <sven at imendio.com>
+
+	Bug 556101 – static mutex yields warnings with g++
+	Reviewed by Tim Janik
+
+	* configure.in: added an intermediate cast to gpointer
+
 2008-05-14  Michael Natterer  <mitch at imendio.com>
 
 	* === Start Maemo-GLib 2.18.1 ===

Modified: projects/haf/trunk/glib/configure.in
===================================================================
--- projects/haf/trunk/glib/configure.in	2008-10-10 16:12:59 UTC (rev 16385)
+++ projects/haf/trunk/glib/configure.in	2008-10-13 13:06:09 UTC (rev 16386)
@@ -2915,7 +2915,7 @@
 };
 #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