stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=b737d4fea7141b8076dd01ee7c7dd8c2c54d3284
commit b737d4fea7141b8076dd01ee7c7dd8c2c54d3284 Author: Stefan Schmidt <[email protected]> Date: Wed Sep 13 14:38:10 2017 +0200 examples/evas: fix recent build break from rectangle change Introduced with commit 13da5e980eb43288b9b9f502cb6a7a000e1f26ea A compile before pushing would have been great, again. Having the same name for two variables is something no compiler likes. evas-map-utils-eo.c:74:8: error: conflicting types for ‘r’ int r, g, b, a, f; ^ evas-map-utils-eo.c:73:19: note: previous declaration of ‘r’ was here Eina_Rectangle r; ^ evas-map-utils-eo.c:93:31: error: ‘h’ undeclared (first use in this function) efl_gfx_size_get(o, NULL, &h); ^ evas-map-utils-eo.c:93:31: note: each undeclared identifier is reported only once for each function it appears in evas-map-utils-eo.c:108:25: error: ‘w’ undeclared (first use in this function) efl_gfx_size_get(o, &w, &h); --- src/examples/evas/evas-map-utils-eo.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/examples/evas/evas-map-utils-eo.c b/src/examples/evas/evas-map-utils-eo.c index 2c701a03ac..005358b797 100644 --- a/src/examples/evas/evas-map-utils-eo.c +++ b/src/examples/evas/evas-map-utils-eo.c @@ -70,8 +70,8 @@ _anim_cb(void *data) { App_Data *ad = data; Evas_Object *o; - Eina_Rectangle r; - int r, g, b, a, f; + Eina_Rectangle rect; + int r, g, b, a, f, h, w; int win_w, win_h, mx, my; f = ad->frame; @@ -128,12 +128,12 @@ _anim_cb(void *data) o = evas_object_name_find(ad->canvas, "obj4"); - r = efl_gfx_geometry_get(o); + rect = efl_gfx_geometry_get(o); efl_gfx_map_reset(o); efl_gfx_map_smooth_set(o, ad->smooth); efl_gfx_map_alpha_set(o, ad->alpha); - efl_gfx_map_coord_absolute_set(o, 0, r.x, r.y + r.h, 0); - efl_gfx_map_coord_absolute_set(o, 1, r.x + r.w, r.y + r.h, 0); + efl_gfx_map_coord_absolute_set(o, 0, rect.x, rect.y + rect.h, 0); + efl_gfx_map_coord_absolute_set(o, 1, rect.x + rect.w, rect.y + rect.h, 0); efl_gfx_map_coord_absolute_set(o, 2, win_w - 10, win_h - 30, 0); efl_gfx_map_coord_absolute_set(o, 3, (win_w / 2) + 10, win_h - 30, 0); efl_gfx_map_uv_set(o, 0, 0, 1); --
