diff --git a/ChangeLog b/ChangeLog
index b86f19059..b1bc539ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-20  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	Bug 316221 - G_LOCK warns about breaking strict-aliasing rules
+
+	* configure.in:
+	* glib/gthread.h: Revert previous patch as it doesn't improve the
+	situation and results in other warnings.
+
 2008-06-19  Tor Lillqvist  <tml@novell.com>
 
 	Bug 539074 - Cannot get exit status with g_spawn_command_line_sync()
diff --git a/configure.in b/configure.in
index 9ce924df8..ec7f9ebd1 100644
--- a/configure.in
+++ b/configure.in
@@ -2830,15 +2830,9 @@ struct _GStaticMutex
   } static_mutex;
 };
 #define	G_STATIC_MUTEX_INIT	{ NULL, { { $g_mutex_contents} } }
-#ifdef __cplusplus
 #define	g_static_mutex_get_mutex(mutex) \\
   (g_thread_use_default_impl ? ((GMutex*) ((mutex)->static_mutex.pad)) : \\
    g_static_mutex_get_mutex_impl_shortcut (&((mutex)->runtime_mutex)))
-#else
-#define	g_static_mutex_get_mutex(mutex) \\
-  (g_thread_use_default_impl ? ((GMutex*) (void*) ((mutex)->static_mutex.pad)) : \\
-   g_static_mutex_get_mutex_impl_shortcut (&((mutex)->runtime_mutex)))
-#endif
 _______EOF
 	else
 		cat >>$outfile <<_______EOF
diff --git a/glib/gthread.h b/glib/gthread.h
index a92b31683..032507c2b 100644
--- a/glib/gthread.h
+++ b/glib/gthread.h
@@ -140,15 +140,9 @@ void    g_thread_init_with_errorcheck_mutexes (GThreadFunctions* vtable);
 /* internal function for fallback static mutex implementation */
 GMutex* g_static_mutex_get_mutex_impl   (GMutex **mutex);
 
-#ifdef __cplusplus
 #define g_static_mutex_get_mutex_impl_shortcut(mutex) \
   (g_atomic_pointer_get ((gpointer*)(void*)mutex) ? *(mutex) : \
    g_static_mutex_get_mutex_impl (mutex))
-#else
-#define g_static_mutex_get_mutex_impl_shortcut(mutex) \
-  (g_atomic_pointer_get (mutex) ? *(mutex) : \
-   g_static_mutex_get_mutex_impl (mutex))
-#endif
 
 /* shorthands for conditional and unconditional function calls */