--- clutter-1.6.16/clutter/cogl/cogl/cogl-bitmap.c-orig	2011-07-06 14:49:59.323413104 -0500
+++ clutter-1.6.16/clutter/cogl/cogl/cogl-bitmap.c	2011-07-06 14:58:29.869608590 -0500
@@ -431,8 +431,10 @@ void
 _cogl_bitmap_unmap (CoglBitmap *bitmap)
 {
   /* Divert to another bitmap if this data is shared */
-  if (bitmap->shared_bmp)
-    return _cogl_bitmap_unmap (bitmap->shared_bmp);
+  if (bitmap->shared_bmp) {
+    _cogl_bitmap_unmap (bitmap->shared_bmp);
+    return;
+  }
 
   g_assert (bitmap->mapped);
   bitmap->mapped = FALSE;
@@ -483,8 +485,10 @@ void
 _cogl_bitmap_unbind (CoglBitmap *bitmap)
 {
   /* Divert to another bitmap if this data is shared */
-  if (bitmap->shared_bmp)
-    return _cogl_bitmap_unbind (bitmap->shared_bmp);
+  if (bitmap->shared_bmp) {
+    _cogl_bitmap_unbind (bitmap->shared_bmp);
+    return;
+  }
 
   g_assert (bitmap->bound);
   bitmap->bound = FALSE;
--- clutter-1.6.16/clutter/cogl/cogl/cogl-debug.h-orig	2011-07-06 14:47:53.584963798 -0500
+++ clutter-1.6.16/clutter/cogl/cogl/cogl-debug.h	2011-07-06 14:57:52.894986754 -0500
@@ -104,7 +104,7 @@ extern unsigned int _cogl_debug_flags[CO
 
 #else
 #define COGL_NOTE(type,...)                         G_STMT_START {            \
-        if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_##type)) {             \
+        if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_##type))) {             \
           char *_fmt = g_strdup_printf (__VA_ARGS__);                         \
           _cogl_profile_trace_message ("[" #type "] " G_STRLOC " & %s", _fmt);\
           g_free (_fmt);                                                      \
--- clutter-1.6.16/clutter/clutter-main.c-orig	2011-07-06 15:10:54.469769690 -0500
+++ clutter-1.6.16/clutter/clutter-main.c	2011-07-06 15:11:02.584730787 -0500
@@ -3289,7 +3289,8 @@ _clutter_context_release_id (guint32 id_
 {
   ClutterMainContext *context = _clutter_context_get_default ();
 
-  return _clutter_id_pool_remove (context->id_pool, id_);
+  _clutter_id_pool_remove (context->id_pool, id_);
+  return;
 }
 
 void
