diff options
| author | Emmanuele Bassi <ebassi@linux.intel.com> | 2011-07-18 13:52:45 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@linux.intel.com> | 2011-07-18 15:37:38 +0100 |
| commit | 2fc069888fa75aa77368136a68ccf734d213dcf2 (patch) | |
| tree | 077484d5c8db551811ad9dd4aa23c82b7cf308a8 | |
| parent | 6f79eb8a5a530fc2fd0a9aed90da172fbf05f742 (diff) | |
| download | cogl-2fc069888fa75aa77368136a68ccf734d213dcf2.tar.gz | |
Compilation fixes for suncc
https://bugzilla.gnome.org/show_bug.cgi?id=654718
Reviewed-by: Neil Roberts <neil@linux.intel.com>
Reviewed-by: Robert Bragg <robert@linux.intel.com>
| -rw-r--r-- | cogl/cogl-bitmap.c | 10 | ||||
| -rw-r--r-- | cogl/cogl-debug.h | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/cogl/cogl-bitmap.c b/cogl/cogl-bitmap.c index cc83dda7..88ad073b 100644 --- a/cogl/cogl-bitmap.c +++ b/cogl/cogl-bitmap.c @@ -432,7 +432,10 @@ _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); + { + _cogl_bitmap_unmap (bitmap->shared_bmp); + return; + } g_assert (bitmap->mapped); bitmap->mapped = FALSE; @@ -484,7 +487,10 @@ _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); + { + _cogl_bitmap_unbind (bitmap->shared_bmp); + return; + } g_assert (bitmap->bound); bitmap->bound = FALSE; diff --git a/cogl/cogl-debug.h b/cogl/cogl-debug.h index 80607ce6..bf2d3190 100644 --- a/cogl/cogl-debug.h +++ b/cogl/cogl-debug.h @@ -94,7 +94,7 @@ extern GHashTable *_cogl_debug_instances; #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); \ |