brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compilation fixes for suncc

Browse Source 
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>
This commit is contained in:
Emmanuele Bassi 2011-07-18 13:52:45 +01:00
parent 6f79eb8a5a
commit 2fc069888f
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cogl/cogl-bitmap.c
View File

@ -432,7 +432,10 @@ _cogl_bitmap_unmap (CoglBitmap *bitmap)
{ {
/* Divert to another bitmap if this data is shared */ /* Divert to another bitmap if this data is shared */
if (bitmap->shared_bmp) if (bitmap->shared_bmp)
return _cogl_bitmap_unmap (bitmap->shared_bmp); {
_cogl_bitmap_unmap (bitmap->shared_bmp);
return;
}
g_assert (bitmap->mapped); g_assert (bitmap->mapped);
bitmap->mapped = FALSE; bitmap->mapped = FALSE;
@ -484,7 +487,10 @@ _cogl_bitmap_unbind (CoglBitmap *bitmap)
{ {
/* Divert to another bitmap if this data is shared */ /* Divert to another bitmap if this data is shared */
if (bitmap->shared_bmp) if (bitmap->shared_bmp)
return _cogl_bitmap_unbind (bitmap->shared_bmp); {
_cogl_bitmap_unbind (bitmap->shared_bmp);
return;
}
g_assert (bitmap->bound); g_assert (bitmap->bound);
bitmap->bound = FALSE; bitmap->bound = FALSE;

2
cogl/cogl-debug.h
View File

@ -94,7 +94,7 @@ extern GHashTable *_cogl_debug_instances;
#else #else
#define COGL_NOTE(type,...) G_STMT_START { \ #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__); \ char *_fmt = g_strdup_printf (__VA_ARGS__); \
_cogl_profile_trace_message ("[" #type "] " G_STRLOC " & %s", _fmt);\ _cogl_profile_trace_message ("[" #type "] " G_STRLOC " & %s", _fmt);\
g_free (_fmt); \ g_free (_fmt); \