edje: fix windows build

Summary:
"far" and "near" are keywords on windows and can't be used as names of variables.

@fix

Reviewers: cedric, Hermet, raster, perepelits.m

Subscribers: reutskiy.v.v, cedric

Differential Revision: https://phab.enlightenment.org/D2037

Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>

diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index 27cfeb9..138e248 100644 (file)
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -9188,8 +9188,8 @@ st_collections_group_parts_part_description_camera_properties(void)
 
    ed->camera.camera.fovy = FROM_DOUBLE(parse_float(0));
    ed->camera.camera.aspect = FROM_DOUBLE(parse_float(1));
-   ed->camera.camera.near = FROM_DOUBLE(parse_float(2));
-   ed->camera.camera.far = FROM_DOUBLE(parse_float(3));
+   ed->camera.camera.frustum_near = FROM_DOUBLE(parse_float(2));
+   ed->camera.camera.frustum_far = FROM_DOUBLE(parse_float(3));
 }
 
 /**

diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index fb82a93..f2d9f6c 100644 (file)
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -1384,8 +1384,8 @@ struct _Edje_Part_Description_Spec_Camera
    struct {
       Evas_Real       fovy;
       Evas_Real       aspect;
-      Evas_Real       near;
-      Evas_Real       far;
+      Evas_Real       frustum_near;
+      Evas_Real       frustum_far;
    } camera;
 
    struct {