devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=a782beba82e77c374228be2aaf1cfa09bcc40aaf
commit a782beba82e77c374228be2aaf1cfa09bcc40aaf Author: Chris Michael <[email protected]> Date: Tue Dec 12 10:19:37 2017 -0500 re-enable building against latest efl git In EFL git head, this function has changed to be just evas_object_coords_inside_get. This patch wraps the two different function names around an #ifdef so we can check EFL version that we are building against and call the correct function accordingly. Fixes T6500 Signed-off-by: Chris Michael <[email protected]> --- src/bin/e_comp_object.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index c1a7941c7..acc3bc5b6 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -3365,7 +3365,17 @@ e_comp_object_coords_inside_input_area(Evas_Object *obj, int x, int y) Eina_Array_Iterator it; EINA_ARRAY_ITER_NEXT(cw->input_objs, i, rect, it) - if (evas_object_pointer_coords_inside_get(rect, x, y)) return EINA_TRUE; + { +#ifndef EFL_VERSION_1_21 + if (evas_object_pointer_coords_inside_get(rect, x, y)) + return EINA_TRUE; +#else + Eina_Position2D pos = {x, y}; + + if (evas_object_coords_inside_get(rect, pos)) + return EINA_TRUE; +#endif + } return EINA_FALSE; } --
