efl/evas: add ecore-evas dependent examples.

nice feature of single tree efl is that evas examples can use ecore-evas :-)



SVN revision: 81919

18 files changed, 203 insertions, 191 deletions

diff --git a/src/examples/ecore/Makefile.am b/src/examples/ecore/Makefile.am
index edcab2b69d..5aed168ea8 100644
--- a/src/examples/ecore/Makefile.am
+++ b/src/examples/ecore/Makefile.am
@@ -17,7 +17,6 @@ AM_CPPFLAGS = \
 -I$(top_builddir)/src/lib/ecore_con \
 -I$(top_builddir)/src/lib/ecore_evas \
 -I$(top_builddir)/src/lib/ecore_audio \
--DPACKAGE_EXAMPLES_DIR=\"$(datadir)/ecore/examples\" \
 @ECORE_CFLAGS@
 
 EXTRA_PROGRAMS = \
diff --git a/src/examples/eina/Makefile.am b/src/examples/eina/Makefile.am
index 5bb9e83d97..fe57e5ec57 100644
--- a/src/examples/eina/Makefile.am
+++ b/src/examples/eina/Makefile.am
@@ -41,8 +41,8 @@ eina_value_01.c \
 eina_value_02.c \
 eina_value_03.c \
 eina_inarray_01.c \
-eina_inarray_02.c
-#eina_magic_01.c \
+eina_inarray_02.c \
+eina_magic_01.c
 #eina_model_01.c \
 #eina_model_02.c \
 #eina_model_03.c
@@ -100,12 +100,31 @@ eina_inarray_02
 #eina_model_04_parrot.h \
 #eina_model_04_whistler.h
 
-# TODO: use ecore_evas from single tree
-#if BUILD_TILER_EXAMPLE
-#AM_CPPFLAGS += @ECORE_EVAS_CFLAGS@
-#EXTRA_PROGRAMS += eina_tiler_01
-#eina_tiler_01_LDADD = $(top_builddir)/src/lib/eina/libeina.la @ECORE_EVAS_LDFLAGS@
-#endif
+EXTRA_PROGRAMS += eina_tiler_01
+
+eina_tiler_01_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/ecore_input \
+-I$(top_srcdir)/src/lib/ecore_evas \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eo \
+-I$(top_builddir)/src/lib/evas \
+-I$(top_builddir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/ecore_input \
+-I$(top_builddir)/src/lib/ecore_evas \
+@EINA_CFLAGS@
+
+eina_tiler_01_LDADD = \
+$(top_builddir)/src/lib/eina/libeina.la \
+$(top_builddir)/src/lib/eo/libeo.la \
+$(top_builddir)/src/lib/ecore/libecore.la \
+$(top_builddir)/src/lib/ecore_input/libecore_input.la \
+$(top_builddir)/src/lib/ecore_evas/libecore_evas.la \
+$(top_builddir)/src/lib/evas/libevas.la \
+@EINA_LDFLAGS@
 
 examples: $(EXTRA_PROGRAMS)
 
diff --git a/src/examples/evas/Makefile.am b/src/examples/evas/Makefile.am
index 4e2471b2da..c73b42098f 100644
--- a/src/examples/evas/Makefile.am
+++ b/src/examples/evas/Makefile.am
@@ -26,56 +26,90 @@ EXTRA_PROGRAMS += evas_init_shutdown
 evas_init_shutdown_SOURCES = evas-init-shutdown.c
 evas_init_shutdown_LDADD = $(top_builddir)/src/lib/evas/libevas.la @EVAS_LDFLAGS@
 
-#the ones using ecore_evas follow
-#AM_CPPFLAGS += @ECORE_EVAS_CFLAGS@
-
-#EXTRA_PROGRAMS += evas_images
-#evas_images_SOURCES = evas-images.c
-#evas_images_LDADD = $(top_builddir)/src/lib/evas/libevas.la @ECORE_EVAS_LIBS@
-
-#EXTRA_PROGRAMS += evas_events
-#evas_events_SOURCES = evas-events.c
-#evas_events_LDADD = $(top_builddir)/src/lib/evas/libevas.la @ECORE_EVAS_LIBS@
-
-#EXTRA_PROGRAMS += evas_object_manipulation
-#evas_object_manipulation_SOURCES = evas-object-manipulation.c
-#evas_object_manipulation_LDADD = $(top_builddir)/src/lib/evas/libevas.la @ECORE_EVAS_LIBS@
-
-#EXTRA_PROGRAMS += evas_object_manipulation-eo
-#evas_object_manipulation_SOURCES = evas-object-manipulation-eo.c
-#evas_object_manipulation_LDADD = $(top_builddir)/src/lib/evas/libevas.la @ECORE_EVAS_LIBS@
-
-#EXTRA_PROGRAMS += evas_hints
-#evas_hints_SOURCES = evas-hints.c
-#evas_hints_LDADD = $(top_builddir)/src/lib/evas/libevas.la @ECORE_EVAS_LIBS@
-
-#EXTRA_PROGRAMS += evas_stacking
-#evas_stacking_SOURCES = evas-stacking.c
-#evas_stacking_LDADD = $(top_builddir)/src/lib/evas/libevas.la @ECORE_EVAS_LIBS@
-
-#EXTRA_PROGRAMS += evas_images2
-#evas_images2_SOURCES = evas-images2.c
-#evas_images2_LDADD = $(top_builddir)/src/lib/evas/libevas.la @ECORE_EVAS_LIBS@
-
-#EXTRA_PROGRAMS += evas_images3
-#evas_images3_SOURCES = evas-images3.c
-#evas_images3_LDADD = $(top_builddir)/src/lib/evas/libevas.la @ECORE_EVAS_LIBS@
-
-#EXTRA_PROGRAMS += evas_text
-#evas_text_SOURCES = evas-text.c
-#evas_text_LDADD = $(top_builddir)/src/lib/evas/libevas.la @ECORE_EVAS_LIBS@
-
-#EXTRA_PROGRAMS += evas_smart_object
-#evas_smart_object_SOURCES = evas-smart-object.c
-#evas_smart_object_LDADD = $(top_builddir)/src/lib/evas/libevas.la @ECORE_EVAS_LIBS@
-
-#EXTRA_PROGRAMS += evas_smart_interface
-#evas_smart_interface_SOURCES = evas-smart-interface.c
-#evas_smart_interface_LDADD = $(top_builddir)/src/lib/evas/libevas.la @ECORE_EVAS_LIBS@
+ECORE_EVAS_COMMON_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/ecore_input \
+-I$(top_srcdir)/src/lib/ecore_evas \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eo \
+-I$(top_builddir)/src/lib/evas \
+-I$(top_builddir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/ecore_input \
+-I$(top_builddir)/src/lib/ecore_evas \
+-DPACKAGE_EXAMPLES_DIR=\".\" \
+@EVAS_CFLAGS@
 
-#EXTRA_PROGRAMS += evas_box
-#evas_box_SOURCES = evas-box.c
-#evas_box_LDADD = $(top_builddir)/src/lib/evas/libevas.la @ECORE_EVAS_LIBS@ @EVAS_GENERAL_LIBS@
+ECORE_EVAS_COMMON_LDADD = \
+$(top_builddir)/src/lib/eina/libeina.la \
+$(top_builddir)/src/lib/eo/libeo.la \
+$(top_builddir)/src/lib/ecore/libecore.la \
+$(top_builddir)/src/lib/ecore_input/libecore_input.la \
+$(top_builddir)/src/lib/ecore_evas/libecore_evas.la \
+$(top_builddir)/src/lib/evas/libevas.la \
+@EVAS_LDFLAGS@
+
+EXTRA_PROGRAMS += evas_images
+evas_images_SOURCES = evas-images.c
+evas_images_LDADD = $(ECORE_EVAS_COMMON_LDADD)
+evas_images_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
+
+EXTRA_PROGRAMS += evas_events
+evas_events_SOURCES = evas-events.c
+evas_events_LDADD = $(ECORE_EVAS_COMMON_LDADD)
+evas_events_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
+
+EXTRA_PROGRAMS += evas_object_manipulation
+evas_object_manipulation_SOURCES = evas-object-manipulation.c
+evas_object_manipulation_LDADD = $(ECORE_EVAS_COMMON_LDADD)
+evas_object_manipulation_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
+
+EXTRA_PROGRAMS += evas_object_manipulation-eo
+evas_object_manipulation_eo_SOURCES = evas-object-manipulation-eo.c
+evas_object_manipulation_eo_LDADD = $(ECORE_EVAS_COMMON_LDADD)
+evas_object_manipulation_eo_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
+
+EXTRA_PROGRAMS += evas_hints
+evas_hints_SOURCES = evas-hints.c
+evas_hints_LDADD = $(ECORE_EVAS_COMMON_LDADD)
+evas_hints_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
+
+EXTRA_PROGRAMS += evas_stacking
+evas_stacking_SOURCES = evas-stacking.c
+evas_stacking_LDADD = $(ECORE_EVAS_COMMON_LDADD)
+evas_stacking_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
+
+EXTRA_PROGRAMS += evas_images2
+evas_images2_SOURCES = evas-images2.c
+evas_images2_LDADD = $(ECORE_EVAS_COMMON_LDADD)
+evas_images2_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
+
+EXTRA_PROGRAMS += evas_images3
+evas_images3_SOURCES = evas-images3.c
+evas_images3_LDADD = $(ECORE_EVAS_COMMON_LDADD)
+evas_images3_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
+
+EXTRA_PROGRAMS += evas_text
+evas_text_SOURCES = evas-text.c
+evas_text_LDADD = $(ECORE_EVAS_COMMON_LDADD)
+evas_text_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
+
+EXTRA_PROGRAMS += evas_smart_object
+evas_smart_object_SOURCES = evas-smart-object.c
+evas_smart_object_LDADD = $(ECORE_EVAS_COMMON_LDADD)
+evas_smart_object_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
+
+EXTRA_PROGRAMS += evas_smart_interface
+evas_smart_interface_SOURCES = evas-smart-interface.c
+evas_smart_interface_LDADD = $(ECORE_EVAS_COMMON_LDADD)
+evas_smart_interface_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
+
+EXTRA_PROGRAMS += evas_box
+evas_box_SOURCES = evas-box.c
+evas_box_LDADD = $(ECORE_EVAS_COMMON_LDADD)
+evas_box_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
 
 #the ones using ecore_evas and edje follow
 #AM_CPPFLAGS += @EDJE_CFLAGS@
diff --git a/src/examples/evas/evas-aspect-hints.c b/src/examples/evas/evas-aspect-hints.c
index de8ed50178..be301cbce1 100644
--- a/src/examples/evas/evas-aspect-hints.c
+++ b/src/examples/evas/evas-aspect-hints.c
@@ -14,8 +14,9 @@
  */
 
 #ifdef HAVE_CONFIG_H
-
 #include "config.h"
+#else
+#define PACKAGE_EXAMPLES_DIR "."
 #endif
 
 #include <Ecore.h>
@@ -76,8 +77,8 @@ _get_aspect_name(Evas_Aspect_Control aspect)
 }
 
 static void
-_on_keydown(void        *data __UNUSED__,
-            Evas        *evas __UNUSED__,
+_on_keydown(void        *data EINA_UNUSED,
+            Evas        *evas EINA_UNUSED,
             Evas_Object *o,
             void        *einfo)
 {
diff --git a/src/examples/evas/evas-box.c b/src/examples/evas/evas-box.c
index ec795355fc..839759ef52 100644
--- a/src/examples/evas/evas-box.c
+++ b/src/examples/evas/evas-box.c
@@ -10,11 +10,9 @@
  */
 
 #ifdef HAVE_CONFIG_H
-
 #include "config.h"
 #else
 #define PACKAGE_EXAMPLES_DIR "."
-#define __UNUSED__
 #endif
 
 #include <Ecore.h>
@@ -59,7 +57,7 @@ static struct exemple_data d;
 static void /* custom 'diagonal' layout */
 _custom_layout(Evas_Object          *o,
                Evas_Object_Box_Data *p,
-               void                 *data __UNUSED__)
+               void                 *data EINA_UNUSED)
 {
    int x, y, w, h;
    int xx, yy, ww, hh;
@@ -100,9 +98,9 @@ _new_rectangle_add(Evas *e)
 /* use the following commands to interact with this example - 'h' is
  * the key for help */
 static void
-_on_keydown(void        *data __UNUSED__,
-            Evas        *evas __UNUSED__,
-            Evas_Object *o __UNUSED__,
+_on_keydown(void        *data EINA_UNUSED,
+            Evas        *evas EINA_UNUSED,
+            Evas_Object *o EINA_UNUSED,
             void        *einfo)
 {
    Evas_Event_Key_Down *ev = einfo;
@@ -284,7 +282,7 @@ list_free:
 }
 
 static void
-_on_delete(Ecore_Evas *ee __UNUSED__)
+_on_delete(Ecore_Evas *ee EINA_UNUSED)
 {
    ecore_main_loop_quit();
 }
diff --git a/src/examples/evas/evas-events.c b/src/examples/evas/evas-events.c
index 28b22ed7e5..d89082399c 100644
--- a/src/examples/evas/evas-events.c
+++ b/src/examples/evas/evas-events.c
@@ -15,10 +15,7 @@
 
 #include "config.h"
 #else
-
 #define PACKAGE_EXAMPLES_DIR "."
-#define __UNUSED__
-
 #endif
 
 #include <Ecore.h>
@@ -65,7 +62,7 @@ _canvas_resize_cb(Ecore_Evas *ee)
 
 /* called when our rectangle gets focus */
 static void
-_object_focus_in_cb(void *data __UNUSED__,
+_object_focus_in_cb(void *data EINA_UNUSED,
                     Evas *e,
                     void *event_info)
 {
@@ -81,16 +78,16 @@ _object_focus_in_cb(void *data __UNUSED__,
 
 /* render flush callback */
 static void
-_render_flush_cb(void *data __UNUSED__,
-                 Evas *e __UNUSED__,
-                 void *event_info __UNUSED__)
+_render_flush_cb(void *data EINA_UNUSED,
+                 Evas *e EINA_UNUSED,
+                 void *event_info EINA_UNUSED)
 {
    fprintf(stdout, "Canvas is about to flush its rendering pipeline!\n");
 }
 
 /* put some action in the canvas */
 static Eina_Bool
-_resize_cb(void *data __UNUSED__)
+_resize_cb(void *data EINA_UNUSED)
 {
    int w, h, cw, ch;
 
@@ -107,7 +104,7 @@ _resize_cb(void *data __UNUSED__)
 
 /* let's have our events back */
 static Eina_Bool
-_thaw_cb(void *data __UNUSED__)
+_thaw_cb(void *data EINA_UNUSED)
 {
    fprintf(stdout, "Canvas was frozen %d times, now thawing.\n",
            evas_event_freeze_get(d.canvas));
@@ -117,28 +114,28 @@ _thaw_cb(void *data __UNUSED__)
 
 /* mouse enters the object's area */
 static void
-_on_mouse_in(void        *data __UNUSED__,
-             Evas        *evas __UNUSED__,
-             Evas_Object *o __UNUSED__,
-             void        *einfo __UNUSED__)
+_on_mouse_in(void        *data EINA_UNUSED,
+             Evas        *evas EINA_UNUSED,
+             Evas_Object *o EINA_UNUSED,
+             void        *einfo EINA_UNUSED)
 {
    fprintf(stdout, "Enlightenment logo has had the mouse in.\n");
 }
 
 static void
-_on_mouse_out(void        *data __UNUSED__,
-              Evas        *evas __UNUSED__,
-              Evas_Object *o __UNUSED__,
-              void        *einfo __UNUSED__)
+_on_mouse_out(void        *data EINA_UNUSED,
+              Evas        *evas EINA_UNUSED,
+              Evas_Object *o EINA_UNUSED,
+              void        *einfo EINA_UNUSED)
 {
    fprintf(stdout, "Enlightenment logo has had the mouse out.\n");
 } /* mouse exits the object's area */
 
 /* examine the keys pressed */
 static void
-_on_keydown(void        *data __UNUSED__,
+_on_keydown(void        *data EINA_UNUSED,
             Evas        *evas,
-            Evas_Object *o __UNUSED__,
+            Evas_Object *o EINA_UNUSED,
             void        *einfo)
 {
    const Evas_Modifier *mods;
diff --git a/src/examples/evas/evas-hints.c b/src/examples/evas/evas-hints.c
index 78c09ba4ab..d88924b0e0 100644
--- a/src/examples/evas/evas-hints.c
+++ b/src/examples/evas/evas-hints.c
@@ -17,7 +17,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #else
-#define __UNUSED__
+#define PACKAGE_EXAMPLES_DIR "."
 #endif
 
 #include <Ecore.h>
@@ -29,7 +29,6 @@
 
 #define WIDTH  320
 #define HEIGHT 480
-#define PACKAGE_EXAMPLES_DIR "."
 
 static const char commands[] = \
   "commands are:\n"
@@ -134,9 +133,9 @@ _print_rect_stats(Evas_Object *rect)
 /* use the following commands to interact with this example - 'h' is
  * the key for help */
 static void
-_on_keydown(void        *data __UNUSED__,
-            Evas        *evas __UNUSED__,
-            Evas_Object *o __UNUSED__,
+_on_keydown(void        *data EINA_UNUSED,
+            Evas        *evas EINA_UNUSED,
+            Evas_Object *o EINA_UNUSED,
             void        *einfo)
 {
    Evas_Event_Key_Down *ev = einfo;
@@ -271,7 +270,7 @@ _on_keydown(void        *data __UNUSED__,
 }
 
 static void
-_on_destroy(Ecore_Evas *ee __UNUSED__)
+_on_destroy(Ecore_Evas *ee EINA_UNUSED)
 {
    ecore_main_loop_quit();
 }
diff --git a/src/examples/evas/evas-images.c b/src/examples/evas/evas-images.c
index a8cf3c41fa..59ca8d3c99 100644
--- a/src/examples/evas/evas-images.c
+++ b/src/examples/evas/evas-images.c
@@ -11,13 +11,9 @@
  */
 
 #ifdef HAVE_CONFIG_H
-
 #include "config.h"
 #else
-
 #define PACKAGE_EXAMPLES_DIR "."
-#define __UNUSED__
-
 #endif
 
 #include <Ecore.h>
@@ -56,7 +52,7 @@ struct test_data
 static struct test_data d = {0};
 
 static void
-_on_destroy(Ecore_Evas *ee __UNUSED__)
+_on_destroy(Ecore_Evas *ee EINA_UNUSED)
 {
    ecore_main_loop_quit();
 }
@@ -92,9 +88,9 @@ _border_fill_mode_to_str(Evas_Border_Fill_Mode mode)
 }
 
 static void
-_on_keydown(void        *data __UNUSED__,
-            Evas        *evas __UNUSED__,
-            Evas_Object *o __UNUSED__,
+_on_keydown(void        *data EINA_UNUSED,
+            Evas        *evas EINA_UNUSED,
+            Evas_Object *o EINA_UNUSED,
             void        *einfo)
 {
    Evas_Event_Key_Down *ev = einfo;
diff --git a/src/examples/evas/evas-images2.c b/src/examples/evas/evas-images2.c
index 64f4c9fc43..b1c8c79977 100644
--- a/src/examples/evas/evas-images2.c
+++ b/src/examples/evas/evas-images2.c
@@ -11,13 +11,9 @@
  */
 
 #ifdef HAVE_CONFIG_H
-
 #include "config.h"
 #else
-
 #define PACKAGE_EXAMPLES_DIR "."
-#define __UNUSED__
-
 #endif
 
 #include <Ecore.h>
@@ -51,7 +47,7 @@ struct test_data
 static struct test_data d = {0};
 
 static void
-_mouse_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
+_mouse_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
             void *event_info)
 {
    Evas_Event_Mouse_Down *ev = event_info;
@@ -60,7 +56,7 @@ _mouse_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
 }
 
 static void
-_mouse_move(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
+_mouse_move(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
             void *event_info)
 {
    Evas_Event_Mouse_Move *ev = event_info;
@@ -69,7 +65,7 @@ _mouse_move(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
 }
 
 static void
-_mouse_up(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
+_mouse_up(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
           void *event_info)
 {
    Evas_Event_Mouse_Up *ev = event_info;
@@ -78,7 +74,7 @@ _mouse_up(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
 }
 
 static void
-_multi_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
+_multi_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
             void *event_info)
 {
    Evas_Event_Multi_Down *ev = event_info;
@@ -87,7 +83,7 @@ _multi_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
 }
 
 static void
-_multi_move(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
+_multi_move(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
              void *event_info)
 {
    Evas_Event_Multi_Move *ev = event_info;
@@ -96,7 +92,7 @@ _multi_move(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
 }
 
 static void
-_multi_up(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
+_multi_up(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
           void *event_info)
 {
    Evas_Event_Multi_Up *ev = event_info;
@@ -105,7 +101,7 @@ _multi_up(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
 }
 
 static void
-_mouse_in(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
+_mouse_in(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
           void *event_info)
 {
    Evas_Event_Mouse_In *ev = event_info;
@@ -114,7 +110,7 @@ _mouse_in(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
 }
 
 static void
-_mouse_out(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
+_mouse_out(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
            void *event_info)
 {
    Evas_Event_Mouse_Out *ev = event_info;
@@ -123,7 +119,7 @@ _mouse_out(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
 }
 
 static void
-_hold(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
+_hold(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
       void *event_info)
 {
    Evas_Event_Hold *ev = event_info;
@@ -131,16 +127,16 @@ _hold(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
 }
 
 static void
-_on_preloaded(void        *data __UNUSED__,
-              Evas        *e __UNUSED__,
-              Evas_Object *obj __UNUSED__,
-              void        *event_info __UNUSED__)
+_on_preloaded(void        *data EINA_UNUSED,
+              Evas        *e EINA_UNUSED,
+              Evas_Object *obj EINA_UNUSED,
+              void        *event_info EINA_UNUSED)
 {
     fprintf(stdout, "Image has been pre-loaded!\n");
 }
 
 static void
-_on_destroy(Ecore_Evas *ee __UNUSED__)
+_on_destroy(Ecore_Evas *ee EINA_UNUSED)
 {
    ecore_main_loop_quit();
 }
@@ -157,9 +153,9 @@ _canvas_resize_cb(Ecore_Evas *ee)
 }
 
 static void
-_on_keydown(void        *data __UNUSED__,
-            Evas        *evas __UNUSED__,
-            Evas_Object *o __UNUSED__,
+_on_keydown(void        *data EINA_UNUSED,
+            Evas        *evas EINA_UNUSED,
+            Evas_Object *o EINA_UNUSED,
             void        *einfo)
 {
    Evas_Event_Key_Down *ev = einfo;
diff --git a/src/examples/evas/evas-images3.c b/src/examples/evas/evas-images3.c
index 5d627b0a37..1c667728ea 100644
--- a/src/examples/evas/evas-images3.c
+++ b/src/examples/evas/evas-images3.c
@@ -11,13 +11,9 @@
  */
 
 #ifdef HAVE_CONFIG_H
-
 #include "config.h"
 #else
-
 #define PACKAGE_EXAMPLES_DIR "."
-#define __UNUSED__
-
 #endif
 
 #include <Ecore.h>
@@ -50,7 +46,7 @@ struct test_data
 static struct test_data d = {0};
 
 static void
-_on_destroy(Ecore_Evas *ee __UNUSED__)
+_on_destroy(Ecore_Evas *ee EINA_UNUSED)
 {
    ecore_main_loop_quit();
 }
@@ -70,9 +66,9 @@ _canvas_resize_cb(Ecore_Evas *ee)
 }
 
 static void
-_on_keydown(void        *data __UNUSED__,
-            Evas        *evas __UNUSED__,
-            Evas_Object *o __UNUSED__,
+_on_keydown(void        *data EINA_UNUSED,
+            Evas        *evas EINA_UNUSED,
+            Evas_Object *o EINA_UNUSED,
             void        *einfo)
 {
    Evas_Event_Key_Down *ev = einfo;
diff --git a/src/examples/evas/evas-map-utils.c b/src/examples/evas/evas-map-utils.c
index 2d15882f53..78fdd68201 100644
--- a/src/examples/evas/evas-map-utils.c
+++ b/src/examples/evas/evas-map-utils.c
@@ -4,7 +4,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #else
-#define __UNUSED__
+#define PACKAGE_EXAMPLES_DIR "."
 #endif
 
 #include <Ecore.h>
@@ -222,13 +222,13 @@ _objs_fit(Evas *e)
 }
 
 static void
-_on_resize(void *data __UNUSED__, Evas *e, Evas_Object *o __UNUSED__, void *event __UNUSED__)
+_on_resize(void *data EINA_UNUSED, Evas *e, Evas_Object *o EINA_UNUSED, void *event EINA_UNUSED)
 {
    _objs_fit(e);
 }
 
 static void
-_on_free(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *event __UNUSED__)
+_on_free(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *event EINA_UNUSED)
 {
    ecore_main_loop_quit();
 }
diff --git a/src/examples/evas/evas-object-manipulation-eo.c b/src/examples/evas/evas-object-manipulation-eo.c
index 7f05ae3f13..99f1064d9a 100644
--- a/src/examples/evas/evas-object-manipulation-eo.c
+++ b/src/examples/evas/evas-object-manipulation-eo.c
@@ -14,13 +14,9 @@
  */
 
 #ifdef HAVE_CONFIG_H
-
 #include "config.h"
 #else
-
 #define PACKAGE_EXAMPLES_DIR "."
-#define __UNUSED__
-
 #endif
 
 #include <Ecore.h>
@@ -63,9 +59,9 @@ _canvas_resize_cb(Ecore_Evas *ee)
 }
 
 static void
-_on_keydown(void        *data __UNUSED__,
-            Evas        *evas __UNUSED__,
-            Evas_Object *o __UNUSED__,
+_on_keydown(void        *data EINA_UNUSED,
+            Evas        *evas EINA_UNUSED,
+            Evas_Object *o EINA_UNUSED,
             void        *einfo)
 {
    Evas_Event_Key_Down *ev = einfo;
diff --git a/src/examples/evas/evas-object-manipulation.c b/src/examples/evas/evas-object-manipulation.c
index e9c94427c6..2ecc2b503d 100644
--- a/src/examples/evas/evas-object-manipulation.c
+++ b/src/examples/evas/evas-object-manipulation.c
@@ -11,13 +11,9 @@
  */
 
 #ifdef HAVE_CONFIG_H
-
 #include "config.h"
 #else
-
 #define PACKAGE_EXAMPLES_DIR "."
-#define __UNUSED__
-
 #endif
 
 #include <Ecore.h>
@@ -52,9 +48,9 @@ _canvas_resize_cb(Ecore_Evas *ee)
 }
 
 static void
-_on_keydown(void        *data __UNUSED__,
-            Evas        *evas __UNUSED__,
-            Evas_Object *o __UNUSED__,
+_on_keydown(void        *data EINA_UNUSED,
+            Evas        *evas EINA_UNUSED,
+            Evas_Object *o EINA_UNUSED,
             void        *einfo)
 {
    Evas_Event_Key_Down *ev = einfo;
diff --git a/src/examples/evas/evas-smart-interface.c b/src/examples/evas/evas-smart-interface.c
index 97b9a9e6a6..02ab8b2d7c 100644
--- a/src/examples/evas/evas-smart-interface.c
+++ b/src/examples/evas/evas-smart-interface.c
@@ -10,13 +10,9 @@
  */
 
 #ifdef HAVE_CONFIG_H
-
 #include "config.h"
 #else
-
 #define PACKAGE_EXAMPLES_DIR "."
-#define __UNUSED__
-
 #endif
 
 #include <Ecore.h>
@@ -183,7 +179,7 @@ EVAS_SMART_SUBCLASS_IFACE_NEW
   _smart_interfaces);
 
 static void
-_on_destroy(Ecore_Evas *ee __UNUSED__)
+_on_destroy(Ecore_Evas *ee EINA_UNUSED)
 {
    ecore_main_loop_quit();
 }
@@ -201,9 +197,9 @@ _canvas_resize_cb(Ecore_Evas *ee)
 
 static void
 _on_child_del(void *data,
-              Evas *evas __UNUSED__,
+              Evas *evas EINA_UNUSED,
               Evas_Object *o,
-              void *einfo __UNUSED__)
+              void *einfo EINA_UNUSED)
 {
    Evas_Object *example_smart = data;
    long idx;
@@ -488,9 +484,9 @@ evas_smart_example_set_right(Evas_Object *o,
 /* END OF example smart object's own interface */
 
 static void
-_on_keydown(void *data __UNUSED__,
-            Evas *evas __UNUSED__,
-            Evas_Object *o __UNUSED__,
+_on_keydown(void *data EINA_UNUSED,
+            Evas *evas EINA_UNUSED,
+            Evas_Object *o EINA_UNUSED,
             void *einfo)
 {
    Evas_Event_Key_Down *ev = einfo;
@@ -666,8 +662,8 @@ _on_keydown(void *data __UNUSED__,
 
 static void
 /* callback on number of member objects changed */
-_on_example_smart_object_child_num_change(void *data __UNUSED__,
-                                          Evas_Object *obj __UNUSED__,
+_on_example_smart_object_child_num_change(void *data EINA_UNUSED,
+                                          Evas_Object *obj EINA_UNUSED,
                                           void *event_info)
 {
    fprintf(stdout, "Number of child members on our example smart"
diff --git a/src/examples/evas/evas-smart-object.c b/src/examples/evas/evas-smart-object.c
index 8b65981390..2a2bd256bb 100644
--- a/src/examples/evas/evas-smart-object.c
+++ b/src/examples/evas/evas-smart-object.c
@@ -13,10 +13,7 @@
 
 #include "config.h"
 #else
-
 #define PACKAGE_EXAMPLES_DIR "."
-#define __UNUSED__
-
 #endif
 
 #include <Ecore.h>
@@ -141,7 +138,7 @@ EVAS_SMART_SUBCLASS_NEW(_evas_smart_example_type, _evas_smart_example,
                         evas_object_smart_clipped_class_get, _smart_callbacks);
 
 static void
-_on_destroy(Ecore_Evas *ee __UNUSED__)
+_on_destroy(Ecore_Evas *ee EINA_UNUSED)
 {
    ecore_main_loop_quit();
 }
@@ -159,9 +156,9 @@ _canvas_resize_cb(Ecore_Evas *ee)
 
 static void
 _on_child_del(void *data,
-              Evas *evas __UNUSED__,
+              Evas *evas EINA_UNUSED,
               Evas_Object *o,
-              void *einfo __UNUSED__)
+              void *einfo EINA_UNUSED)
 {
    Evas_Object *example_smart = data;
    long idx;
@@ -461,9 +458,9 @@ _map_update(void)
 }
 
 static void
-_on_keydown(void *data __UNUSED__,
-            Evas *evas __UNUSED__,
-            Evas_Object *o __UNUSED__,
+_on_keydown(void *data EINA_UNUSED,
+            Evas *evas EINA_UNUSED,
+            Evas_Object *o EINA_UNUSED,
             void *einfo)
 {
    Evas_Event_Key_Down *ev = einfo;
@@ -659,8 +656,8 @@ _on_keydown(void *data __UNUSED__,
 
 static void
 /* callback on number of member objects changed */
-_on_example_smart_object_child_num_change(void *data __UNUSED__,
-                                          Evas_Object *obj __UNUSED__,
+_on_example_smart_object_child_num_change(void *data EINA_UNUSED,
+                                          Evas_Object *obj EINA_UNUSED,
                                           void *event_info)
 {
    fprintf(stdout, "Number of child members on our example smart"
diff --git a/src/examples/evas/evas-stacking.c b/src/examples/evas/evas-stacking.c
index 49fc81922f..d8e60d6eaa 100644
--- a/src/examples/evas/evas-stacking.c
+++ b/src/examples/evas/evas-stacking.c
@@ -14,9 +14,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #else
-
-#define __UNUSED__
-
+#define PACKAGE_EXAMPLES_DIR "."
 #endif
 
 #include <Ecore.h>
@@ -55,10 +53,10 @@ static const char *commands = \
   "\th - print help\n";
 
 static void
-_on_mouse_down(void        *data __UNUSED__,
-               Evas        *evas __UNUSED__,
+_on_mouse_down(void        *data EINA_UNUSED,
+               Evas        *evas EINA_UNUSED,
                Evas_Object *o,
-               void        *einfo __UNUSED__)
+               void        *einfo EINA_UNUSED)
 {
    fprintf(stdout, "Mouse down on rectangle %s!\n", evas_object_name_get(o));
 }
@@ -77,9 +75,9 @@ _canvas_resize_cb(Ecore_Evas *ee)
 /* use the following commands to interact with this example - 'h' is
  * the key for help */
 static void
-_on_keydown(void        *data __UNUSED__,
-            Evas        *evas __UNUSED__,
-            Evas_Object *o __UNUSED__,
+_on_keydown(void        *data EINA_UNUSED,
+            Evas        *evas EINA_UNUSED,
+            Evas_Object *o EINA_UNUSED,
             void        *einfo)
 {
    Evas_Event_Key_Down *ev = einfo;
@@ -241,7 +239,7 @@ _on_keydown(void        *data __UNUSED__,
 }
 
 static void
-_on_destroy(Ecore_Evas *ee __UNUSED__)
+_on_destroy(Ecore_Evas *ee EINA_UNUSED)
 {
    ecore_main_loop_quit();
 }
diff --git a/src/examples/evas/evas-table.c b/src/examples/evas/evas-table.c
index 19fb68a5a4..8aa2b5e3ec 100644
--- a/src/examples/evas/evas-table.c
+++ b/src/examples/evas/evas-table.c
@@ -11,8 +11,6 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#else
-#define __UNUSED__
 #endif
 
 #include <Ecore.h>
@@ -33,7 +31,7 @@ struct test_data
 static struct test_data d = {0};
 
 static void
-_on_destroy(Ecore_Evas *ee __UNUSED__)
+_on_destroy(Ecore_Evas *ee EINA_UNUSED)
 {
    ecore_main_loop_quit();
 }
diff --git a/src/examples/evas/evas-text.c b/src/examples/evas/evas-text.c
index ba556629cc..e3c3e85d62 100644
--- a/src/examples/evas/evas-text.c
+++ b/src/examples/evas/evas-text.c
@@ -10,13 +10,9 @@
  */
 
 #ifdef HAVE_CONFIG_H
-
 #include "config.h"
 #else
-
 #define PACKAGE_EXAMPLES_DIR "."
-#define __UNUSED__
-
 #endif
 
 #include <Ecore.h>
@@ -94,7 +90,7 @@ struct test_data
 static struct test_data d = {0};
 
 static void
-_on_destroy(Ecore_Evas *ee __UNUSED__)
+_on_destroy(Ecore_Evas *ee EINA_UNUSED)
 {
    ecore_main_loop_quit();
 }
@@ -151,9 +147,9 @@ _text_style_type_to_str(Evas_Text_Style_Type mode)
 }
 
 static void
-_on_keydown(void        *data __UNUSED__,
-            Evas        *evas __UNUSED__,
-            Evas_Object *o __UNUSED__,
+_on_keydown(void        *data EINA_UNUSED,
+            Evas        *evas EINA_UNUSED,
+            Evas_Object *o EINA_UNUSED,
             void        *einfo)
 {
    Evas_Event_Key_Down *ev = einfo;