From de7b6f21575ac5826596ed92197d0f9fee79f954 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Fri, 1 Mar 2019 08:56:16 -0500 Subject: [PATCH] elementary: fix Evas3D examples warning due to double define. Summary: Depends on D8070 Reviewers: devilhorns Reviewed By: devilhorns Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8071 --- src/examples/elementary/evas3d_map_example.c | 8 ++++++-- src/examples/elementary/evas3d_object_on_button_example.c | 10 ++++++---- src/examples/elementary/evas3d_scene_on_button_example.c | 9 ++++++--- src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c | 8 ++++++-- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/src/examples/elementary/evas3d_map_example.c b/src/examples/elementary/evas3d_map_example.c index 5426d30..6ce5329 100644 --- a/src/examples/elementary/evas3d_map_example.c +++ b/src/examples/elementary/evas3d_map_example.c @@ -1,5 +1,9 @@ -#define EFL_BETA_API_SUPPORT -#define EFL_EO_API_SUPPORT +#ifndef EFL_EO_API_SUPPORT +# define EFL_EO_API_SUPPORT +#endif +#ifndef EFL_BETA_API_SUPPORT +# define EFL_BETA_API_SUPPORT +#endif #include diff --git a/src/examples/elementary/evas3d_object_on_button_example.c b/src/examples/elementary/evas3d_object_on_button_example.c index e77d74b..8b6724a 100644 --- a/src/examples/elementary/evas3d_object_on_button_example.c +++ b/src/examples/elementary/evas3d_object_on_button_example.c @@ -5,10 +5,12 @@ * Compile with: * gcc -o evas3d_object_on_button_example evas3d_object_on_button_example.c -g `pkg-config --libs --cflags evas ecore eo elementary` */ - - -#define EFL_BETA_API_SUPPORT -#define EFL_EO_API_SUPPORT +#ifndef EFL_BETA_API_SUPPORT +# define EFL_BETA_API_SUPPORT +#endif +#ifndef EFL_EO_API_SUPPORT +# define EFL_EO_API_SUPPORT +#endif #include #include diff --git a/src/examples/elementary/evas3d_scene_on_button_example.c b/src/examples/elementary/evas3d_scene_on_button_example.c index 8f47c7e..0581799 100644 --- a/src/examples/elementary/evas3d_scene_on_button_example.c +++ b/src/examples/elementary/evas3d_scene_on_button_example.c @@ -5,9 +5,12 @@ * Compile with: * gcc -o evas3d_scene_on_button_example evas3d_scene_on_button_example.c -g `pkg-config --libs --cflags evas ecore eo elementary` */ - -#define EFL_BETA_API_SUPPORT -#define EFL_EO_API_SUPPORT +#ifndef EFL_EO_API_SUPPORT +# define EFL_EO_API_SUPPORT +#endif +#ifndef EFL_BETA_API_SUPPORT +# define EFL_BETA_API_SUPPORT +#endif #define WIDTH 500 #define HEIGHT 500 diff --git a/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c b/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c index 0f8f87f..7b78974 100644 --- a/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c +++ b/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c @@ -14,8 +14,12 @@ * edje_cc sphere_hunter.edc * gcc -o evas_3d_sphere_hunter evas_3d_sphere_hunter.c -g `pkg-config --libs --cflags evas ecore elementary eina eo` -lm */ - -#define EFL_BETA_API_SUPPORT +#ifndef EFL_EO_API_SUPPORT +# define EFL_EO_API_SUPPORT +#endif +#ifndef EFL_BETA_API_SUPPORT +# define EFL_BETA_API_SUPPORT +#endif #include #include -- 2.7.4