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

Don't use the label 'ERROR' because it conflicts with windows.h

Browse Source 
wingdi.h which gets included from windows.h #defines ERROR to 0 so we
can't use it as a label in Cogl. This patch changes it to be error in
lower case instead.

Reviewed-by: Robert Bragg <robert@linux.intel.com>

(cherry picked from commit e9bac2755c2cba84c82a856d369a30560d19a32e)
This commit is contained in:
Neil Roberts 2012-06-20 15:18:15 +01:00 committed by Robert Bragg
parent df77e8565e
commit d1dc4e1e0b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cogl/cogl-blit.c
View File

@ -164,7 +164,7 @@ _cogl_blit_framebuffer_begin (CoglBlitData *data)
dst_fb = COGL_FRAMEBUFFER (dst_offscreen);
if (!cogl_framebuffer_allocate (dst_fb, NULL))
goto ERROR;
goto error;
src_offscreen= _cogl_offscreen_new_to_texture_full
(data->src_tex,
@ -172,17 +172,17 @@ _cogl_blit_framebuffer_begin (CoglBlitData *data)
0 /* level */);
if (src_offscreen == NULL)
goto ERROR;
goto error;
src_fb = COGL_FRAMEBUFFER (src_offscreen);
if (!cogl_framebuffer_allocate (src_fb, NULL))
goto ERROR;
goto error;
_cogl_push_framebuffers (dst_fb, src_fb);
return TRUE;
ERROR:
error:
if (dst_offscreen)
cogl_object_unref (dst_offscreen);