diff options
| author | Neil Roberts <neil@linux.intel.com> | 2012-06-20 15:18:15 +0100 |
|---|---|---|
| committer | Robert Bragg <robert@linux.intel.com> | 2012-08-06 14:27:45 +0100 |
| commit | d1dc4e1e0b69455c9df0a67bcc2aad7b55e3ee3a (patch) | |
| tree | c3b1ce6e8511deaeb93b9bffd683846c13da862b | |
| parent | df77e8565e9822bfcdeb88b380f64f0f303aaef6 (diff) | |
| download | cogl-d1dc4e1e0b69455c9df0a67bcc2aad7b55e3ee3a.tar.gz | |
Don't use the label 'ERROR' because it conflicts with windows.h
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)
| -rw-r--r-- | cogl/cogl-blit.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cogl/cogl-blit.c b/cogl/cogl-blit.c index 247317f5..2f849730 100644 --- a/cogl/cogl-blit.c +++ b/cogl/cogl-blit.c @@ -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); |