aboutsummaryrefslogtreecommitdiffstats
path: root/src/examples
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2019-03-01 08:56:16 -0500
committerChristopher Michael <cp.michael@samsung.com>2019-03-01 08:59:50 -0500
commit2abee9bfe934c793234a8fcb83dc78122f92f5f7 (patch)
tree84ad50e8881947254aadf176509c0f674703423b /src/examples
parentmeson - make evas loader confg install shell be binsh compliant (diff)
downloadefl-2abee9bfe934c793234a8fcb83dc78122f92f5f7.tar.gz
elementary: fix Evas3D examples warning due to double define.
Summary: Depends on https://phab.enlightenment.org/D8070 Reviewers: devilhorns Reviewed By: devilhorns Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8071
Diffstat (limited to 'src/examples')
-rw-r--r--src/examples/elementary/evas3d_map_example.c8
-rw-r--r--src/examples/elementary/evas3d_object_on_button_example.c10
-rw-r--r--src/examples/elementary/evas3d_scene_on_button_example.c9
-rw-r--r--src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c8
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 5426d30966..6ce53290e3 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 <Elementary.h>
diff --git a/src/examples/elementary/evas3d_object_on_button_example.c b/src/examples/elementary/evas3d_object_on_button_example.c
index e77d74be3d..8b6724aacd 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 <Eo.h>
#include <Evas.h>
diff --git a/src/examples/elementary/evas3d_scene_on_button_example.c b/src/examples/elementary/evas3d_scene_on_button_example.c
index 8f47c7e080..05817990ad 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 0f8f87f41d..7b789740e3 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 <Elementary.h>
#include <Ecore.h>