elm: Changed __UNUSED__ to EINA_UNUSED.

legacy/elementary/doc/examples.dox

@@ -4521,7 +4521,7 @@
  * and the entry itself doesn't, yet, support all the needed capabilities to
  * make this simpler. We begin by getting the format we are using in our
  * function from the button pressed.
- * @skip  _format_change_cb(void *data, Evas_Object *obj, void *event __UNUSED__)
+ * @skip  _format_change_cb(void *data, Evas_Object *obj, void *event EINA_UNUSED))
  * @until sizeof(fmt_close)
  *
  * Next we need to find out if we need to insert an opening or a closing tag.

legacy/elementary/doc/widgets/widget_preview_gengrid.c

@@ -2,19 +2,19 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #else
-# define __UNUSED__
+# define EINA_UNUSED
 #endif
 
 static char *
-_grid_text_get(void        *data __UNUSED__,
-                Evas_Object *obj __UNUSED__,
-                const char  *part __UNUSED__)
+_grid_text_get(void        *data EINA_UNUSED,
+                Evas_Object *obj EINA_UNUSED,
+                const char  *part EINA_UNUSED)
 {
    return strdup("label");
 }
 
 static Evas_Object *
-_grid_content_get(void        *data __UNUSED__,
+_grid_content_get(void        *data EINA_UNUSED,
                Evas_Object *obj,
                const char  *part)
 {

legacy/elementary/doc/widgets/widget_preview_genlist1.c

@@ -2,21 +2,21 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #else
-# define __UNUSED__
+# define EINA_UNUSED
 #endif
 
 static char *
-_text_get(void        *data __UNUSED__,
-           Evas_Object *obj __UNUSED__,
-           const char  *part __UNUSED__)
+_text_get(void        *data EINA_UNUSED,
+           Evas_Object *obj EINA_UNUSED,
+           const char  *part EINA_UNUSED)
 {
    return strdup("label");
 }
 
 static Evas_Object *
-_content_get(void        *data __UNUSED__,
+_content_get(void        *data EINA_UNUSED,
           Evas_Object *obj,
-          const char  *part __UNUSED__)
+          const char  *part EINA_UNUSED)
 {
     Evas_Object *icon = elm_icon_add(obj);
     elm_icon_standard_set(icon, "home");

legacy/elementary/doc/widgets/widget_preview_genlist2.c

@@ -2,21 +2,21 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #else
-# define __UNUSED__
+# define EINA_UNUSED
 #endif
 
 static char *
-_text_get(void        *data __UNUSED__,
-           Evas_Object *obj __UNUSED__,
+_text_get(void        *data EINA_UNUSED,
+           Evas_Object *obj EINA_UNUSED,
            const char  *part)
 {
    return strdup(part);
 }
 
 static Evas_Object *
-_content_get(void        *data __UNUSED__,
+_content_get(void        *data EINA_UNUSED,
           Evas_Object *obj,
-          const char  *part __UNUSED__)
+          const char  *part EINA_UNUSED)
 {
     Evas_Object *icon = elm_icon_add(obj);
     elm_icon_standard_set(icon, "home");

legacy/elementary/doc/widgets/widget_preview_genlist3.c

@@ -2,21 +2,21 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #else
-# define __UNUSED__
+# define EINA_UNUSED
 #endif
 
 static char *
-_text_get(void        *data __UNUSED__,
-           Evas_Object *obj __UNUSED__,
+_text_get(void        *data EINA_UNUSED,
+           Evas_Object *obj EINA_UNUSED,
            const char  *part)
 {
    return strdup(part);
 }
 
 static Evas_Object *
-_content_get(void        *data __UNUSED__,
+_content_get(void        *data EINA_UNUSED,
           Evas_Object *obj,
-          const char  *part __UNUSED__)
+          const char  *part EINA_UNUSED)
 {
     Evas_Object *icon = elm_icon_add(obj);
     elm_icon_standard_set(icon, "home");

legacy/elementary/doc/widgets/widget_preview_genlist4.c

@@ -2,21 +2,21 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #else
-# define __UNUSED__
+# define EINA_UNUSED
 #endif
 
 static char *
-_text_get(void        *data __UNUSED__,
-           Evas_Object *obj __UNUSED__,
+_text_get(void        *data EINA_UNUSED,
+           Evas_Object *obj EINA_UNUSED,
            const char  *part)
 {
    return strdup(part);
 }
 
 static Evas_Object *
-_content_get(void        *data __UNUSED__,
+_content_get(void        *data EINA_UNUSED,
           Evas_Object *obj,
-          const char  *part __UNUSED__)
+          const char  *part EINA_UNUSED)
 {
     Evas_Object *icon = elm_icon_add(obj);
     elm_icon_standard_set(icon, "home");

legacy/elementary/doc/widgets/widget_preview_genlist5.c

@@ -2,21 +2,21 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #else
-# define __UNUSED__
+# define EINA_UNUSED
 #endif
 
 static char *
-_text_get(void        *data __UNUSED__,
-           Evas_Object *obj __UNUSED__,
+_text_get(void        *data EINA_UNUSED,
+           Evas_Object *obj EINA_UNUSED,
            const char  *part)
 {
    return strdup(part);
 }
 
 static Evas_Object *
-_content_get(void        *data __UNUSED__,
+_content_get(void        *data EINA_UNUSED,
           Evas_Object *obj,
-          const char  *part __UNUSED__)
+          const char  *part EINA_UNUSED)
 {
     Evas_Object *icon = elm_icon_add(obj);
     elm_icon_standard_set(icon, "home");

legacy/elementary/doc/widgets/widget_preview_map.c

@@ -1,7 +1,7 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #else
-# define __UNUSED__
+# define EINA_UNUSED
 #endif
 
 #include <Elementary.h>
@@ -20,7 +20,7 @@ _nasty_hack(void *data)
 }
 
 EAPI_MAIN int
-elm_main(int argc __UNUSED__, char **argv)
+elm_main(int argc EINA_UNUSED, char **argv)
 {
    Evas_Object *win, *bg;
    Evas_Coord w, h;

legacy/elementary/doc/widgets/widget_preview_tmpl_head.c

@@ -1,13 +1,13 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #else
-# define __UNUSED__
+# define EINA_UNUSED
 #endif
 
 #include <Elementary.h>
 
 EAPI_MAIN int
-elm_main(int argc __UNUSED__, char **argv)
+elm_main(int argc EINA_UNUSED, char **argv)
 {
    Evas_Object *win, *bg;
    Evas_Coord w, h;

legacy/elementary/src/bin/test_gengrid.c

@@ -1004,21 +1004,21 @@ test_gengrid_item_styles(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
 }
 
 static void
-_rd1_changed_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
+_rd1_changed_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    Show_Data *sd = data;
    sd->winmode = elm_radio_state_value_get(obj);
 }
 
 static void
-_rd2_changed_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
+_rd2_changed_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    Show_Data *sd = data;
    sd->scrollto = elm_radio_state_value_get(obj);
 }
 
 static void
-_bring_in_clicked_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+_bring_in_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Evas_Object *win, *grid;
    static Item_Data ti[5000];
@@ -1077,7 +1077,7 @@ _bring_in_clicked_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info _
 }
 
 static void
-_show_clicked_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+_show_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Evas_Object *win, *grid;
    static Item_Data ti[10000];

legacy/elementary/src/bin/test_progressbar.c

@@ -315,7 +315,7 @@ _pg2_stop_btn_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_i
 }
 
 void
-test_progressbar2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+test_progressbar2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Evas_Object *win, *pb, *bx, *bt, *bt_bx;
    Progressbar_Data *pd;

legacy/elementary/src/edje_externals/elm.c

@@ -32,7 +32,7 @@ external_elm_shutdown(void)
 }
 
 static void
-_external_obj_del(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+_external_obj_del(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    evas_object_event_callback_del(obj, EVAS_CALLBACK_DEL,
                                   _external_obj_del);
@@ -40,7 +40,7 @@ _external_obj_del(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *obj
 }
 
 void
-external_signal(void *data __UNUSED__, Evas_Object *obj, const char *sig, const char *source)
+external_signal(void *data EINA_UNUSED, Evas_Object *obj, const char *sig, const char *source)
 {
    char *_signal = strdup(sig);
    char *p = _signal;
@@ -76,7 +76,7 @@ external_signal(void *data __UNUSED__, Evas_Object *obj, const char *sig, const
 }
 
 const char *
-external_translate(void *data __UNUSED__, const char *orig)
+external_translate(void *data EINA_UNUSED, const char *orig)
 {
    // in future, mark all params as translatable and use dgettext()
    // with "elementary" text domain here.
@@ -90,14 +90,14 @@ typedef struct {
 } Elm_External_Signals_Proxy_Context;
 
 static void
-_external_signal_proxy_free_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+_external_signal_proxy_free_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Elm_External_Signals_Proxy_Context *ctxt = data;
    free(ctxt);
 }
 
 static void
-_external_signal_proxy_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+_external_signal_proxy_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Elm_External_Signals_Proxy_Context *ctxt = data;
    // TODO: Is it worth to check Evas_Smart_Cb_Description and do something
@@ -106,7 +106,7 @@ _external_signal_proxy_cb(void *data, Evas_Object *obj __UNUSED__, void *event_i
 }
 
 Eina_Bool
-external_common_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+external_common_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
 {
    if (!strcmp(param->name, "style"))
      {
@@ -128,7 +128,7 @@ external_common_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ex
 }
 
 Eina_Bool
-external_common_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+external_common_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
 {
    if (!strcmp(param->name, "style"))
      {
@@ -190,7 +190,7 @@ external_signals_proxy(Evas_Object *obj, Evas_Object *edje, const char *part_nam
 }
 
 void
-external_common_params_parse(void *mem, void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+external_common_params_parse(void *mem, void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params)
 {
    Elm_Params *p;
    const Eina_List *l;
@@ -210,7 +210,7 @@ external_common_params_parse(void *mem, void *data __UNUSED__, Evas_Object *obj
 }
 
 void
-external_common_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+external_common_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
 {
    const Elm_Params *p;
    if (to_params) p = to_params;

legacy/elementary/src/edje_externals/elm_actionslider.c

@@ -7,7 +7,7 @@ typedef struct _Elm_Params_Actionslider
 } Elm_Params_Actionslider;
 
 static void
-external_actionslider_state_set(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const void *from_params, const void *to_params, float pos __UNUSED__)
+external_actionslider_state_set(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const void *from_params, const void *to_params, float pos EINA_UNUSED)
 {
    const Elm_Params_Actionslider *p;
 
@@ -20,7 +20,7 @@ external_actionslider_state_set(void *data __UNUSED__, Evas_Object *obj __UNUSED
 }
 
 static Eina_Bool
-external_actionslider_param_set(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Edje_External_Param *param)
+external_actionslider_param_set(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Edje_External_Param *param)
 {
    if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
        && (!strcmp(param->name, "label")))
@@ -36,7 +36,7 @@ external_actionslider_param_set(void *data __UNUSED__, Evas_Object *obj __UNUSED
 }
 
 static Eina_Bool
-external_actionslider_param_get(void *data __UNUSED__, const Evas_Object *obj __UNUSED__, Edje_External_Param *param)
+external_actionslider_param_get(void *data EINA_UNUSED, const Evas_Object *obj EINA_UNUSED, Edje_External_Param *param)
 {
    if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
        && (!strcmp(param->name, "label")))
@@ -52,7 +52,7 @@ external_actionslider_param_get(void *data __UNUSED__, const Evas_Object *obj __
 }
 
 static void *
-external_actionslider_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+external_actionslider_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params)
 {
    Elm_Params_Actionslider *mem;
    Edje_External_Param *param;
@@ -74,8 +74,8 @@ external_actionslider_params_parse(void *data __UNUSED__, Evas_Object *obj __UNU
    return mem;
 }
 
-static Evas_Object *external_actionslider_content_get(void *data __UNUSED__,
-		const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+static Evas_Object *external_actionslider_content_get(void *data EINA_UNUSED,
+		const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
 {
    ERR("No content.");
    return NULL;

legacy/elementary/src/edje_externals/elm_bg.c

@@ -26,9 +26,9 @@ _bg_option_get(const char *option)
 }
 
 static void
-external_bg_state_set(void *data __UNUSED__, Evas_Object *obj,
+external_bg_state_set(void *data EINA_UNUSED, Evas_Object *obj,
                       const void *from_params, const void *to_params,
-                      float pos __UNUSED__)
+                      float pos EINA_UNUSED)
 {
    const Elm_Params_Bg *p;
    Elm_Bg_Option option;
@@ -49,7 +49,7 @@ external_bg_state_set(void *data __UNUSED__, Evas_Object *obj,
 }
 
 static Eina_Bool
-external_bg_param_set(void *data __UNUSED__, Evas_Object *obj,
+external_bg_param_set(void *data EINA_UNUSED, Evas_Object *obj,
                       const Edje_External_Param *param)
 {
    if ((!strcmp(param->name, "file"))
@@ -73,8 +73,8 @@ external_bg_param_set(void *data __UNUSED__, Evas_Object *obj,
 }
 
 static Eina_Bool
-external_bg_param_get(void *data __UNUSED__,
-                      const Evas_Object *obj __UNUSED__,
+external_bg_param_get(void *data EINA_UNUSED,
+                      const Evas_Object *obj EINA_UNUSED,
                       Edje_External_Param *param)
 {
    if ((!strcmp(param->name, "file"))
@@ -99,7 +99,7 @@ external_bg_param_get(void *data __UNUSED__,
 }
 
 static void *
-external_bg_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
+external_bg_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
                          const Eina_List *params)
 {
    Elm_Params_Bg *mem;
@@ -122,9 +122,9 @@ external_bg_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
 }
 
 static Evas_Object *
-external_bg_content_get(void *data __UNUSED__,
-                        const Evas_Object *obj __UNUSED__,
-                        const char *content __UNUSED__)
+external_bg_content_get(void *data EINA_UNUSED,
+                        const Evas_Object *obj EINA_UNUSED,
+                        const char *content EINA_UNUSED)
 {
    ERR("no content");
    return NULL;

legacy/elementary/src/edje_externals/elm_bubble.c

@@ -10,7 +10,7 @@ typedef struct _Elm_Params_Bubble
 } Elm_Params_Bubble;
 
 static void
-external_bubble_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+external_bubble_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
 {
    const Elm_Params_Bubble *p;
 
@@ -26,7 +26,7 @@ external_bubble_state_set(void *data __UNUSED__, Evas_Object *obj, const void *f
 }
 
 static Eina_Bool
-external_bubble_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+external_bubble_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
 {
    if (!strcmp(param->name, "label"))
      {
@@ -73,7 +73,7 @@ external_bubble_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ex
 }
 
 static Eina_Bool
-external_bubble_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+external_bubble_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
 {
    if (!strcmp(param->name, "label"))
      {
@@ -109,7 +109,7 @@ external_bubble_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ex
 }
 
 static void *
-external_bubble_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina_List *params)
+external_bubble_params_parse(void *data EINA_UNUSED, Evas_Object *obj, const Eina_List *params)
 {
    Elm_Params_Bubble *mem;
    Edje_External_Param *param;
@@ -134,8 +134,8 @@ external_bubble_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina
    return mem;
 }
 
-static Evas_Object *external_bubble_content_get(void *data __UNUSED__,
-		const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+static Evas_Object *external_bubble_content_get(void *data EINA_UNUSED,
+		const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
 {
    if (!strcmp(content, "content"))
      return elm_object_content_get(obj);

legacy/elementary/src/edje_externals/elm_button.c

@@ -14,7 +14,7 @@ typedef struct _Elm_Params_Button
 } Elm_Params_Button;
 
 static void
-external_button_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+external_button_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
 {
    const Elm_Params_Button *p;
 
@@ -35,7 +35,7 @@ external_button_state_set(void *data __UNUSED__, Evas_Object *obj, const void *f
 }
 
 static Eina_Bool
-external_button_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+external_button_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
 {
    if (!strcmp(param->name, "label"))
      {
@@ -87,7 +87,7 @@ external_button_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ex
 }
 
 static Eina_Bool
-external_button_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+external_button_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
 {
    if (!strcmp(param->name, "label"))
      {
@@ -134,7 +134,7 @@ external_button_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ex
 }
 
 static void *
-external_button_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina_List *params)
+external_button_params_parse(void *data EINA_UNUSED, Evas_Object *obj, const Eina_List *params)
 {
    Elm_Params_Button *mem;
    Edje_External_Param *param;
@@ -170,8 +170,8 @@ external_button_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina
    return mem;
 }
 
-static Evas_Object *external_button_content_get(void *data __UNUSED__,
-		const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+static Evas_Object *external_button_content_get(void *data EINA_UNUSED,
+		const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
 {
 	ERR("No content.");
 	return NULL;

legacy/elementary/src/edje_externals/elm_calendar.c

@@ -32,9 +32,9 @@ _calendar_select_mode_get(const char *select_mode)
 }
 
 static void
-external_calendar_state_set(void *data __UNUSED__, Evas_Object *obj,
+external_calendar_state_set(void *data EINA_UNUSED, Evas_Object *obj,
                             const void *from_params, const void *to_params,
-                            float pos __UNUSED__)
+                            float pos EINA_UNUSED)
 {
    const Elm_Params_Calendar *p;
    Elm_Calendar_Select_Mode select_mode;
@@ -62,7 +62,7 @@ external_calendar_state_set(void *data __UNUSED__, Evas_Object *obj,
 }
 
 static Eina_Bool
-external_calendar_param_set(void *data __UNUSED__, Evas_Object *obj,
+external_calendar_param_set(void *data EINA_UNUSED, Evas_Object *obj,
                             const Edje_External_Param *param)
 {
    int min,max;
@@ -103,7 +103,7 @@ external_calendar_param_set(void *data __UNUSED__, Evas_Object *obj,
 }
 
 static Eina_Bool
-external_calendar_param_get(void *data __UNUSED__, const Evas_Object *obj,
+external_calendar_param_get(void *data EINA_UNUSED, const Evas_Object *obj,
                             Edje_External_Param *param)
 {
    int min, max;
@@ -143,8 +143,8 @@ external_calendar_param_get(void *data __UNUSED__, const Evas_Object *obj,
 }
 
 static void *
-external_calendar_params_parse(void *data __UNUSED__,
-                               Evas_Object *obj __UNUSED__,
+external_calendar_params_parse(void *data EINA_UNUSED,
+                               Evas_Object *obj EINA_UNUSED,
                                const Eina_List *params)
 {
    Elm_Params_Calendar *mem;
@@ -171,9 +171,9 @@ external_calendar_params_parse(void *data __UNUSED__,
 }
 
 static Evas_Object *
-external_calendar_content_get(void *data __UNUSED__,
-                              const Evas_Object *obj __UNUSED__,
-                              const char *content __UNUSED__)
+external_calendar_content_get(void *data EINA_UNUSED,
+                              const Evas_Object *obj EINA_UNUSED,
+                              const char *content EINA_UNUSED)
 {
    ERR("No content.");
    return NULL;

legacy/elementary/src/edje_externals/elm_check.c

@@ -10,7 +10,7 @@ typedef struct _Elm_Params_Check
 } Elm_Params_Check;
 
 static void
-external_check_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+external_check_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
 {
    const Elm_Params_Check *p;
 
@@ -27,7 +27,7 @@ external_check_state_set(void *data __UNUSED__, Evas_Object *obj, const void *fr
 }
 
 static Eina_Bool
-external_check_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+external_check_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
 {
    if (!strcmp(param->name, "label"))
      {
@@ -63,7 +63,7 @@ external_check_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ext
 }
 
 static Eina_Bool
-external_check_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+external_check_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
 {
    if (!strcmp(param->name, "label"))
      {
@@ -94,7 +94,7 @@ external_check_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ext
 }
 
 static void *
-external_check_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina_List *params)
+external_check_params_parse(void *data EINA_UNUSED, Evas_Object *obj, const Eina_List *params)
 {
    Elm_Params_Check *mem;
    Edje_External_Param *param;
@@ -120,8 +120,8 @@ external_check_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina_
    return mem;
 }
 
-static Evas_Object *external_check_content_get(void *data __UNUSED__,
-		const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+static Evas_Object *external_check_content_get(void *data EINA_UNUSED,
+		const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
 {
 	ERR("No content.");
 	return NULL;

legacy/elementary/src/edje_externals/elm_clock.c

@@ -13,7 +13,7 @@ typedef struct _Elm_Params_Clock
 } Elm_Params_Clock;
 
 static void
-external_clock_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+external_clock_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
 {
    const Elm_Params_Clock *p;
 
@@ -44,7 +44,7 @@ external_clock_state_set(void *data __UNUSED__, Evas_Object *obj, const void *fr
 }
 
 static Eina_Bool
-external_clock_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+external_clock_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
 {
    if (!strcmp(param->name, "hours"))
      {
@@ -108,7 +108,7 @@ external_clock_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ext
 }
 
 static Eina_Bool
-external_clock_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+external_clock_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
 {
    if (!strcmp(param->name, "hours"))
      {
@@ -173,7 +173,7 @@ external_clock_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ext
 }
 
 static void *
-external_clock_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+external_clock_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params)
 {
    Elm_Params_Clock *mem;
    Edje_External_Param *param;
@@ -211,8 +211,8 @@ external_clock_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
    return mem;
 }
 
-static Evas_Object *external_clock_content_get(void *data __UNUSED__,
-		const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+static Evas_Object *external_clock_content_get(void *data EINA_UNUSED,
+		const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
 {
 	ERR("No content.");
 	return NULL;

legacy/elementary/src/edje_externals/elm_entry.c

@@ -43,7 +43,7 @@ _entry_line_wrap_choices_setting_get(const char *line_wrap_str)
 }
 
 static void
-external_entry_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+external_entry_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
 {
    const Elm_Params_Entry *p;
    Eina_Bool hbounce, vbounce;
@@ -85,7 +85,7 @@ external_entry_state_set(void *data __UNUSED__, Evas_Object *obj, const void *fr
 }
 
 static Eina_Bool
-external_entry_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+external_entry_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
 {
    if (!strcmp(param->name, "label"))
      {
@@ -185,7 +185,7 @@ external_entry_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ext
 }
 
 static Eina_Bool
-external_entry_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+external_entry_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
 {
    if (!strcmp(param->name, "label"))
      {
@@ -278,7 +278,7 @@ external_entry_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ext
 }
 
 static void *
-external_entry_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina_List *params)
+external_entry_params_parse(void *data EINA_UNUSED, Evas_Object *obj, const Eina_List *params)
 {
    Elm_Params_Entry *mem;
    Edje_External_Param *param;
@@ -337,8 +337,8 @@ external_entry_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina_
    return mem;
 }
 
-static Evas_Object *external_entry_content_get(void *data __UNUSED__,
-                                               const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+static Evas_Object *external_entry_content_get(void *data EINA_UNUSED,
+                                               const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
 {
    ERR("No content.");
    return NULL;

legacy/elementary/src/edje_externals/elm_fileselector.c

@@ -16,7 +16,7 @@ typedef struct _Elm_Params_Fileselector
 } Elm_Params_Fileselector;
 
 static void
-external_fileselector_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+external_fileselector_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
 {
    const Elm_Params_Fileselector *p;
 
@@ -35,7 +35,7 @@ external_fileselector_state_set(void *data __UNUSED__, Evas_Object *obj, const v
 }
 
 static Eina_Bool
-external_fileselector_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+external_fileselector_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
 {
    if (!strcmp(param->name, "save"))
      {
@@ -77,7 +77,7 @@ external_fileselector_param_set(void *data __UNUSED__, Evas_Object *obj, const E
 }
 
 static Eina_Bool
-external_fileselector_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+external_fileselector_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
 {
    if (!strcmp(param->name, "save"))
      {
@@ -119,7 +119,7 @@ external_fileselector_param_get(void *data __UNUSED__, const Evas_Object *obj, E
 }
 
 static void *
-external_fileselector_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+external_fileselector_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params)
 {
    Elm_Params_Fileselector *mem;
    Edje_External_Param *param;
@@ -156,8 +156,8 @@ external_fileselector_params_parse(void *data __UNUSED__, Evas_Object *obj __UNU
    return mem;
 }
 
-static Evas_Object *external_fileselector_content_get(void *data __UNUSED__,
-		const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+static Evas_Object *external_fileselector_content_get(void *data EINA_UNUSED,
+		const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
 {
    ERR("No content.");
    return NULL;

legacy/elementary/src/edje_externals/elm_fileselector_button.c

@@ -20,7 +20,7 @@ typedef struct _Elm_Params_fileselector_button
 } Elm_Params_fileselector_button;
 
 static void
-external_fileselector_button_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+external_fileselector_button_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
 {
    const Elm_Params_fileselector_button *p;
 
@@ -43,7 +43,7 @@ external_fileselector_button_state_set(void *data __UNUSED__, Evas_Object *obj,
 }
 
 static Eina_Bool
-external_fileselector_button_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+external_fileselector_button_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
 {
    if (!strcmp(param->name, "label"))
      {
@@ -111,7 +111,7 @@ external_fileselector_button_param_set(void *data __UNUSED__, Evas_Object *obj,
 }
 
 static Eina_Bool
-external_fileselector_button_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+external_fileselector_button_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
 {
    if (!strcmp(param->name, "label"))
      {
@@ -174,7 +174,7 @@ external_fileselector_button_param_get(void *data __UNUSED__, const Evas_Object
 }
 
 static void *
-external_fileselector_button_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina_List *params)
+external_fileselector_button_params_parse(void *data EINA_UNUSED, Evas_Object *obj, const Eina_List *params)
 {
    Elm_Params_fileselector_button *mem;
    Edje_External_Param *param;
@@ -217,7 +217,7 @@ external_fileselector_button_params_parse(void *data __UNUSED__, Evas_Object *ob
    return mem;
 }
 
-static Evas_Object *external_fileselector_button_content_get(void *data __UNUSED__, const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+static Evas_Object *external_fileselector_button_content_get(void *data EINA_UNUSED, const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
 {
    ERR("No content.");
    return NULL;

legacy/elementary/src/edje_externals/elm_fileselector_entry.c

@@ -20,7 +20,7 @@ typedef struct _Elm_Params_fileselector_entry
 } Elm_Params_fileselector_entry;
 
 static void
-external_fileselector_entry_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+external_fileselector_entry_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
 {
    const Elm_Params_fileselector_entry *p;
 
@@ -43,7 +43,7 @@ external_fileselector_entry_state_set(void *data __UNUSED__, Evas_Object *obj, c
 }
 
 static Eina_Bool
-external_fileselector_entry_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+external_fileselector_entry_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
 {
    if (!strcmp(param->name, "label"))
      {
@@ -111,7 +111,7 @@ external_fileselector_entry_param_set(void *data __UNUSED__, Evas_Object *obj, c
 }
 
 static Eina_Bool
-external_fileselector_entry_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+external_fileselector_entry_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
 {
    if (!strcmp(param->name, "label"))
      {
@@ -174,7 +174,7 @@ external_fileselector_entry_param_get(void *data __UNUSED__, const Evas_Object *
 }
 
 static void *
-external_fileselector_entry_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina_List *params)
+external_fileselector_entry_params_parse(void *data EINA_UNUSED, Evas_Object *obj, const Eina_List *params)
 {
    Elm_Params_fileselector_entry *mem;
    Edje_External_Param *param;
@@ -217,8 +217,8 @@ external_fileselector_entry_params_parse(void *data __UNUSED__, Evas_Object *obj
    return mem;
 }
 
-static Evas_Object *external_fileselector_entry_content_get(void *data __UNUSED__,
-                                                            const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+static Evas_Object *external_fileselector_entry_content_get(void *data EINA_UNUSED,
+                                                            const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
 {
    ERR("No content.");
    return NULL;

legacy/elementary/src/edje_externals/elm_frame.c

@@ -8,7 +8,7 @@ typedef struct _Elm_Params_Frame
 } Elm_Params_Frame;
 
 static void
-external_frame_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+external_frame_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
 {
    const Elm_Params_Frame *p;
 
@@ -21,7 +21,7 @@ external_frame_state_set(void *data __UNUSED__, Evas_Object *obj, const void *fr
 }
 
 static Eina_Bool
-external_frame_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+external_frame_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
 {
    if (!strcmp(param->name, "label"))
      {
@@ -50,7 +50,7 @@ external_frame_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ext
 }
 
 static Eina_Bool
-external_frame_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+external_frame_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
 {
    if (!strcmp(param->name, "label"))
      {
@@ -73,7 +73,7 @@ external_frame_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ext
 }
 
 static void *
-external_frame_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina_List *params)
+external_frame_params_parse(void *data EINA_UNUSED, Evas_Object *obj, const Eina_List *params)
 {
    Elm_Params_Frame *mem;
    Edje_External_Param *param;
@@ -94,8 +94,8 @@ external_frame_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina_
    return mem;
 }
 
-static Evas_Object *external_frame_content_get(void *data __UNUSED__,
-                                               const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+static Evas_Object *external_frame_content_get(void *data EINA_UNUSED,
+                                               const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
 {
    if (!strcmp(content, "content"))
      return elm_object_content_get(obj);

legacy/elementary/src/edje_externals/elm_gengrid.c

@@ -32,7 +32,7 @@ typedef struct _Elm_Params_Gengrid
 } Elm_Params_Gengrid;
 
 static void
-external_gengrid_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+external_gengrid_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
 {
    const Elm_Params_Gengrid *p;
 
@@ -108,7 +108,7 @@ external_gengrid_state_set(void *data __UNUSED__, Evas_Object *obj, const void *
 }
 
 static Eina_Bool
-external_gengrid_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+external_gengrid_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
 {
    if (!strcmp(param->name, "multi select"))
      {
@@ -231,7 +231,7 @@ external_gengrid_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E
 }
 
 static Eina_Bool
-external_gengrid_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+external_gengrid_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
 {
    if (!strcmp(param->name, "multi select"))
      {
@@ -356,7 +356,7 @@ external_gengrid_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_E
 }
 
 static void *
-external_gengrid_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+external_gengrid_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params)
 {
    Elm_Params_Gengrid *mem;
    Edje_External_Param *param;
@@ -434,7 +434,7 @@ external_gengrid_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__
 }
 
 static Evas_Object *
-external_gengrid_content_get(void *data __UNUSED__, const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+external_gengrid_content_get(void *data EINA_UNUSED, const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
 {
    ERR("No content.");
    return NULL;

legacy/elementary/src/edje_externals/elm_genlist.c

@@ -39,7 +39,7 @@ _list_horizontal_setting_get(const char *horizontal_str)
 }
 
 static void
-external_genlist_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+external_genlist_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
 {
    const Elm_Params_Genlist *p;
 
@@ -87,7 +87,7 @@ external_genlist_state_set(void *data __UNUSED__, Evas_Object *obj, const void *
 }
 
 static Eina_Bool
-external_genlist_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+external_genlist_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
 {
    if (!strcmp(param->name, "horizontal mode"))
      {
@@ -166,7 +166,7 @@ external_genlist_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E
 }
 
 static Eina_Bool
-external_genlist_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+external_genlist_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
 {
    if (!strcmp(param->name, "horizontal mode"))
      {
@@ -249,7 +249,7 @@ external_genlist_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_E
 }
 
 static void *
-external_genlist_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+external_genlist_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params)
 {
    Elm_Params_Genlist *mem;
    Edje_External_Param *param;
@@ -298,8 +298,8 @@ external_genlist_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__
    return mem;
 }
 
-static Evas_Object *external_genlist_content_get(void *data __UNUSED__,
-		const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+static Evas_Object *external_genlist_content_get(void *data EINA_UNUSED,
+		const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
 {
 	ERR("No content.");
 	return NULL;

legacy/elementary/src/edje_externals/elm_hoversel.c

@@ -10,7 +10,7 @@ typedef struct _Elm_Params_Hoversel
 } Elm_Params_Hoversel;
 
 static void
-external_hoversel_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+external_hoversel_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
 {
    const Elm_Params_Hoversel *p;
 
@@ -27,7 +27,7 @@ external_hoversel_state_set(void *data __UNUSED__, Evas_Object *obj, const void
 }
 
 static Eina_Bool
-external_hoversel_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+external_hoversel_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
 {
    if (!strcmp(param->name, "label"))
      {
@@ -63,7 +63,7 @@ external_hoversel_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_
 }
 
 static Eina_Bool
-external_hoversel_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+external_hoversel_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
 {
    if (!strcmp(param->name, "label"))
      {
@@ -94,7 +94,7 @@ external_hoversel_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_
 }
 
 static void *
-external_hoversel_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina_List *params)
+external_hoversel_params_parse(void *data EINA_UNUSED, Evas_Object *obj, const Eina_List *params)
 {
    Elm_Params_Hoversel *mem;
    Edje_External_Param *param;
@@ -120,8 +120,8 @@ external_hoversel_params_parse(void *data __UNUSED__, Evas_Object *obj, const Ei
    return mem;
 }
 
-static Evas_Object *external_hoversel_content_get(void *data __UNUSED__,
-		const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+static Evas_Object *external_hoversel_content_get(void *data EINA_UNUSED,
+		const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
 {
 	ERR("No content.");
 	return NULL;

legacy/elementary/src/edje_externals/elm_icon.c

@@ -23,9 +23,9 @@ typedef struct _Elm_Params_Icon
 static Elm_Params_Icon *param_icon;
 
 static void
-external_icon_state_set(void *data __UNUSED__, Evas_Object *obj,
+external_icon_state_set(void *data EINA_UNUSED, Evas_Object *obj,
                         const void *from_params, const void *to_params,
-                        float pos __UNUSED__)
+                        float pos EINA_UNUSED)
 {
    const Elm_Params_Icon *p;
    Evas_Object *edje;
@@ -90,7 +90,7 @@ external_icon_state_set(void *data __UNUSED__, Evas_Object *obj,
 }
 
 static Eina_Bool
-external_icon_param_set(void *data __UNUSED__, Evas_Object *obj,
+external_icon_param_set(void *data EINA_UNUSED, Evas_Object *obj,
                         const Edje_External_Param *param)
 {
    Evas_Object *edje;
@@ -166,8 +166,8 @@ external_icon_param_set(void *data __UNUSED__, Evas_Object *obj,
 }
 
 static Eina_Bool
-external_icon_param_get(void *data __UNUSED__,
-                        const Evas_Object *obj __UNUSED__,
+external_icon_param_get(void *data EINA_UNUSED,
+                        const Evas_Object *obj EINA_UNUSED,
                         Edje_External_Param *param)
 {
    if (!strcmp(param->name, "file")
@@ -225,7 +225,7 @@ external_icon_param_get(void *data __UNUSED__,
 }
 
 static void *
-external_icon_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
+external_icon_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
                            const Eina_List *params)
 {
    Elm_Params_Icon *mem;
@@ -280,9 +280,9 @@ external_icon_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
 }
 
 static Evas_Object *
-external_icon_content_get(void *data __UNUSED__,
-                          const Evas_Object *obj __UNUSED__,
-                          const char *content __UNUSED__)
+external_icon_content_get(void *data EINA_UNUSED,
+                          const Evas_Object *obj EINA_UNUSED,
+                          const char *content EINA_UNUSED)
 {
    ERR("no content");
    return NULL;

legacy/elementary/src/edje_externals/elm_index.c

@@ -9,7 +9,7 @@ typedef struct _Elm_Params_Index
 } Elm_Params_Index;
 
 static void
-external_index_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+external_index_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
 {
    const Elm_Params_Index *p;
 
@@ -22,7 +22,7 @@ external_index_state_set(void *data __UNUSED__, Evas_Object *obj, const void *fr
 }
 
 static Eina_Bool
-external_index_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+external_index_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
 {
    if (!strcmp(param->name, "active"))
      {
@@ -39,7 +39,7 @@ external_index_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ext
 }
 
 static Eina_Bool
-external_index_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+external_index_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
 {
    if (!strcmp(param->name, "active"))
      {
@@ -57,7 +57,7 @@ external_index_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ext
 }
 
 static void *
-external_index_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+external_index_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params)
 {
    Elm_Params_Index *mem;
    Edje_External_Param *param;
@@ -79,8 +79,8 @@ external_index_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
    return mem;
 }
 
-static Evas_Object *external_index_content_get(void *data __UNUSED__,
-		const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+static Evas_Object *external_index_content_get(void *data EINA_UNUSED,
+		const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
 {
    ERR("No content.");
    return NULL;

legacy/elementary/src/edje_externals/elm_label.c

@@ -7,7 +7,7 @@ typedef struct _Elm_Params_Label
 } Elm_Params_Label;
 
 static void
-external_label_state_set(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const void *from_params, const void *to_params, float pos __UNUSED__)
+external_label_state_set(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const void *from_params, const void *to_params, float pos EINA_UNUSED)
 {
    const Elm_Params_Label *p;
 
@@ -19,7 +19,7 @@ external_label_state_set(void *data __UNUSED__, Evas_Object *obj __UNUSED__, con
 }
 
 static Eina_Bool
-external_label_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+external_label_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
 {
    if (!strcmp(param->name, "label"))
      {
@@ -37,7 +37,7 @@ external_label_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ext
 }
 
 static Eina_Bool
-external_label_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+external_label_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
 {
    if (!strcmp(param->name, "label"))
      {
@@ -55,7 +55,7 @@ external_label_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ext
 }
 
 static void *
-external_label_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params __UNUSED__)
+external_label_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params EINA_UNUSED)
 {
    Elm_Params_Label *mem;
    Edje_External_Param *param;
@@ -74,8 +74,8 @@ external_label_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
    return mem;
 }
 
-static Evas_Object *external_label_content_get(void *data __UNUSED__,
-		const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+static Evas_Object *external_label_content_get(void *data EINA_UNUSED,
+		const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
 {
 	ERR("no content");
 	return NULL;

legacy/elementary/src/edje_externals/elm_list.c

@@ -45,7 +45,7 @@ _list_mode_setting_get(const char *mode_str)
 }
 
 static void
-external_list_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+external_list_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
 {
    const Elm_Params_List *p;
    Elm_Scroller_Policy policy_h, policy_v;
@@ -97,7 +97,7 @@ external_list_state_set(void *data __UNUSED__, Evas_Object *obj, const void *fro
 }
 
 static Eina_Bool
-external_list_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+external_list_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
 {
    if (!strcmp(param->name, "list mode"))
      {
@@ -168,7 +168,7 @@ external_list_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Exte
 }
 
 static Eina_Bool
-external_list_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+external_list_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
 {
    if (!strcmp(param->name, "horizontal mode"))
      {
@@ -241,7 +241,7 @@ external_list_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Exte
 }
 
 static void *
-external_list_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+external_list_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params)
 {
    Elm_Params_List *mem;
    Edje_External_Param *param;
@@ -278,7 +278,7 @@ external_list_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, c
    return mem;
 }
 
-static Evas_Object *external_list_content_get(void *data __UNUSED__, const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+static Evas_Object *external_list_content_get(void *data EINA_UNUSED, const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
 {
    ERR("No content.");
    return NULL;

legacy/elementary/src/edje_externals/elm_map.c

@@ -31,7 +31,7 @@ _zoom_mode_get(const char *map_src)
 }
 
 static void
-external_map_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+external_map_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
 {
    const Elm_Params_Map *p;
 
@@ -53,7 +53,7 @@ external_map_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from
 }
 
 static Eina_Bool
-external_map_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+external_map_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
 {
    if (!strcmp(param->name, "map source"))
      {
@@ -89,7 +89,7 @@ external_map_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Exter
 }
 
 static Eina_Bool
-external_map_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+external_map_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
 {
    if (!strcmp(param->name, "map source"))
      {
@@ -126,7 +126,7 @@ external_map_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Exter
 }
 
 static void *
-external_map_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+external_map_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params)
 {
    Elm_Params_Map *mem;
    Edje_External_Param *param;
@@ -152,8 +152,8 @@ external_map_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, co
    return mem;
 }
 
-static Evas_Object *external_map_content_get(void *data __UNUSED__,
-		const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+static Evas_Object *external_map_content_get(void *data EINA_UNUSED,
+		const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
 {
 	ERR("No content.");
 	return NULL;

legacy/elementary/src/edje_externals/elm_multibuttonentry.c

@@ -7,7 +7,7 @@ typedef struct _Elm_Params_Multibuttonentry
 } Elm_Params_Multibuttonentry;
 
 static void
-external_multibuttonentry_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+external_multibuttonentry_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
 {
    const Elm_Params_Multibuttonentry *p;
 
@@ -22,7 +22,7 @@ external_multibuttonentry_state_set(void *data __UNUSED__, Evas_Object *obj, con
 }
 
 static Eina_Bool
-external_multibuttonentry_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+external_multibuttonentry_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
 {
    if (!strcmp(param->name, "label"))
      {
@@ -48,7 +48,7 @@ external_multibuttonentry_param_set(void *data __UNUSED__, Evas_Object *obj, con
 }
 
 static Eina_Bool
-external_multibuttonentry_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+external_multibuttonentry_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
 {
    if (!strcmp(param->name, "label"))
      {
@@ -74,7 +74,7 @@ external_multibuttonentry_param_get(void *data __UNUSED__, const Evas_Object *ob
 }
 
 static void *
-external_multibuttonentry_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+external_multibuttonentry_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params)
 {
    Elm_Params_Multibuttonentry *mem = NULL;
    Edje_External_Param *param;
@@ -95,7 +95,7 @@ external_multibuttonentry_params_parse(void *data __UNUSED__, Evas_Object *obj _
    return mem;
 }
 
-static Evas_Object *external_multibuttonentry_content_get(void *data __UNUSED__, const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+static Evas_Object *external_multibuttonentry_content_get(void *data EINA_UNUSED, const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
 {
    ERR("so content");
    return NULL;

legacy/elementary/src/edje_externals/elm_naviframe.c

@@ -10,8 +10,8 @@ typedef struct _Elm_Params_Naviframe
 } Elm_Params_Naviframe;
 
 static void
-external_naviframe_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params,
-                             const void *to_params, float pos __UNUSED__)
+external_naviframe_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params,
+                             const void *to_params, float pos EINA_UNUSED)
 {
    const Elm_Params_Naviframe *p;
 
@@ -26,7 +26,7 @@ external_naviframe_state_set(void *data __UNUSED__, Evas_Object *obj, const void
 }
 
 static Eina_Bool
-external_naviframe_param_set(void *data __UNUSED__, Evas_Object *obj,
+external_naviframe_param_set(void *data EINA_UNUSED, Evas_Object *obj,
                              const Edje_External_Param *param)
 {
    if (!strcmp(param->name, "preserve on pop"))
@@ -53,7 +53,7 @@ external_naviframe_param_set(void *data __UNUSED__, Evas_Object *obj,
 }
 
 static Eina_Bool
-external_naviframe_param_get(void *data __UNUSED__, const Evas_Object *obj,
+external_naviframe_param_get(void *data EINA_UNUSED, const Evas_Object *obj,
                              Edje_External_Param *param)
 {
    if (!strcmp(param->name, "preserve on pop"))
@@ -80,7 +80,7 @@ external_naviframe_param_get(void *data __UNUSED__, const Evas_Object *obj,
 }
 
 static void *
-external_naviframe_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
+external_naviframe_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
                                 const Eina_List *params)
 {
    Elm_Params_Naviframe *mem;
@@ -108,8 +108,8 @@ external_naviframe_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED
    return mem;
 }
 
-static Evas_Object *external_naviframe_content_get(void *data __UNUSED__,
-      const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+static Evas_Object *external_naviframe_content_get(void *data EINA_UNUSED,
+      const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
 {
    ERR("No content.");
    return NULL;

legacy/elementary/src/edje_externals/elm_notify.c

@@ -128,9 +128,9 @@ _orient_get(const char *orient)
 }
 
 static void
-external_notify_state_set(void *data __UNUSED__,
+external_notify_state_set(void *data EINA_UNUSED,
                           Evas_Object *obj, const void *from_params,
-                          const void *to_params, float pos __UNUSED__)
+                          const void *to_params, float pos EINA_UNUSED)
 {
    const Elm_Params_Notify *p;
 
@@ -156,7 +156,7 @@ external_notify_state_set(void *data __UNUSED__,
 }
 
 static Eina_Bool
-external_notify_param_set(void *data __UNUSED__,
+external_notify_param_set(void *data EINA_UNUSED,
                           Evas_Object *obj, const Edje_External_Param *param)
 {
    if ((!strcmp(param->name, "content"))
@@ -197,7 +197,7 @@ external_notify_param_set(void *data __UNUSED__,
 }
 
 static Eina_Bool
-external_notify_param_get(void *data __UNUSED__,
+external_notify_param_get(void *data EINA_UNUSED,
                           const Evas_Object *obj, Edje_External_Param *param)
 {
    if (!strcmp(param->name, "content"))
@@ -233,7 +233,7 @@ external_notify_param_get(void *data __UNUSED__,
 }
 
 static void *
-external_notify_params_parse(void *data __UNUSED__, Evas_Object *obj,
+external_notify_params_parse(void *data EINA_UNUSED, Evas_Object *obj,
                              const Eina_List *params) {
    Elm_Params_Notify *mem;
    Edje_External_Param *param;
@@ -265,7 +265,7 @@ external_notify_params_parse(void *data __UNUSED__, Evas_Object *obj,
 }
 
 static Evas_Object *
-external_notify_content_get(void *data __UNUSED__,
+external_notify_content_get(void *data EINA_UNUSED,
                             const Evas_Object *obj, const char *content)
 {
    if (!strcmp(content, "content"))

legacy/elementary/src/edje_externals/elm_panes.c

@@ -16,9 +16,9 @@ struct _Elm_Params_Panes {
    Eina_Bool fixed;
 };
 
-static void external_panes_state_set(void *data __UNUSED__,
+static void external_panes_state_set(void *data EINA_UNUSED,
       Evas_Object *obj, const void *from_params,
-      const void *to_params, float pos __UNUSED__)
+      const void *to_params, float pos EINA_UNUSED)
 {
    const Elm_Params_Panes *p;
 
@@ -42,7 +42,7 @@ static void external_panes_state_set(void *data __UNUSED__,
      elm_panes_fixed_set(obj, p->fixed);
 }
 
-static Eina_Bool external_panes_param_set(void *data __UNUSED__,
+static Eina_Bool external_panes_param_set(void *data EINA_UNUSED,
       Evas_Object *obj, const Edje_External_Param *param)
 {
    if ((!strcmp(param->name, "content left"))
@@ -89,7 +89,7 @@ static Eina_Bool external_panes_param_set(void *data __UNUSED__,
 }
 
 static Eina_Bool
-external_panes_param_get(void *data __UNUSED__, const Evas_Object *obj,
+external_panes_param_get(void *data EINA_UNUSED, const Evas_Object *obj,
                          Edje_External_Param *param)
 {
    if (!strcmp(param->name, "content left"))
@@ -128,7 +128,7 @@ external_panes_param_get(void *data __UNUSED__, const Evas_Object *obj,
 }
 
 static void *
-external_panes_params_parse(void *data __UNUSED__, Evas_Object *obj,
+external_panes_params_parse(void *data EINA_UNUSED, Evas_Object *obj,
                             const Eina_List *params)
 {
    Elm_Params_Panes *mem;
@@ -166,7 +166,7 @@ external_panes_params_parse(void *data __UNUSED__, Evas_Object *obj,
 }
 
 static Evas_Object *
-external_panes_content_get(void *data __UNUSED__, const Evas_Object *obj,
+external_panes_content_get(void *data EINA_UNUSED, const Evas_Object *obj,
                            const char *content)
 {
    if (!strcmp(content, "left"))

legacy/elementary/src/edje_externals/elm_photocam.c

@@ -31,7 +31,7 @@ _zoom_mode_setting_get(const char *zoom_mode_str)
 }
 
 static void
-external_photocam_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+external_photocam_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
 {
    const Elm_Params_Photocam *p;
 
@@ -54,7 +54,7 @@ external_photocam_state_set(void *data __UNUSED__, Evas_Object *obj, const void
 }
 
 static Eina_Bool
-external_photocam_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+external_photocam_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
 {
    if (!strcmp(param->name, "file"))
      {
@@ -98,7 +98,7 @@ external_photocam_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_
 }
 
 static Eina_Bool
-external_photocam_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+external_photocam_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
 {
    if (!strcmp(param->name, "file"))
      {
@@ -145,7 +145,7 @@ external_photocam_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_
 }
 
 static void *
-external_photocam_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+external_photocam_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params)
 {
    Elm_Params_Photocam *mem;
    Edje_External_Param *param;
@@ -176,8 +176,8 @@ external_photocam_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED_
    return mem;
 }
 
-static Evas_Object *external_photocam_content_get(void *data __UNUSED__,
-		const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+static Evas_Object *external_photocam_content_get(void *data EINA_UNUSED,
+		const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
 {
 	ERR("No content.");
 	return NULL;

legacy/elementary/src/edje_externals/elm_progressbar.c

@@ -19,7 +19,7 @@ typedef struct _Elm_Params_Progressbar
 } Elm_Params_Progressbar;
 
 static void
-external_progressbar_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+external_progressbar_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
 {
    const Elm_Params_Progressbar *p;
 
@@ -46,7 +46,7 @@ external_progressbar_state_set(void *data __UNUSED__, Evas_Object *obj, const vo
 }
 
 static Eina_Bool
-external_progressbar_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+external_progressbar_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
 {
    if (!strcmp(param->name, "label"))
      {
@@ -122,7 +122,7 @@ external_progressbar_param_set(void *data __UNUSED__, Evas_Object *obj, const Ed
 }
 
 static Eina_Bool
-external_progressbar_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+external_progressbar_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
 {
    if (!strcmp(param->name, "label"))
      {
@@ -193,7 +193,7 @@ external_progressbar_param_get(void *data __UNUSED__, const Evas_Object *obj, Ed
 }
 
 static void *
-external_progressbar_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+external_progressbar_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params)
 {
    Elm_Params_Progressbar *mem;
    Edje_External_Param *param;
@@ -241,8 +241,8 @@ external_progressbar_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUS
    return mem;
 }
 
-static Evas_Object *external_progressbar_content_get(void *data __UNUSED__,
-		const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+static Evas_Object *external_progressbar_content_get(void *data EINA_UNUSED,
+		const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
 {
 	ERR("No content.");
 	return NULL;

legacy/elementary/src/edje_externals/elm_radio.c

@@ -11,7 +11,7 @@ typedef struct _Elm_Params_Radio
 } Elm_Params_Radio;
 
 static void
-external_radio_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+external_radio_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
 {
    const Elm_Params_Radio *p;
 
@@ -34,7 +34,7 @@ external_radio_state_set(void *data __UNUSED__, Evas_Object *obj, const void *fr
 }
 
 static Eina_Bool
-external_radio_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+external_radio_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
 {
    if (!strcmp(param->name, "label"))
      {
@@ -80,7 +80,7 @@ external_radio_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ext
 }
 
 static Eina_Bool
-external_radio_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+external_radio_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
 {
    if (!strcmp(param->name, "label"))
      {
@@ -116,7 +116,7 @@ external_radio_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ext
 }
 
 static void *
-external_radio_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina_List *params)
+external_radio_params_parse(void *data EINA_UNUSED, Evas_Object *obj, const Eina_List *params)
 {
    Elm_Params_Radio *mem;
    Edje_External_Param *param;
@@ -144,8 +144,8 @@ external_radio_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina_
    return mem;
 }
 
-static Evas_Object *external_radio_content_get(void *data __UNUSED__,
-		const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+static Evas_Object *external_radio_content_get(void *data EINA_UNUSED,
+		const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
 {
 	ERR("No content.");
 	return NULL;

legacy/elementary/src/edje_externals/elm_scroller.c

@@ -11,9 +11,9 @@ struct _Elm_Params_Scroller {
 
 
 
-static void external_scroller_state_set(void *data __UNUSED__,
+static void external_scroller_state_set(void *data EINA_UNUSED,
 		Evas_Object *obj, const void *from_params,
-		const void *to_params, float pos __UNUSED__)
+		const void *to_params, float pos EINA_UNUSED)
 {
 	const Elm_Params_Scroller *p;
 
@@ -26,7 +26,7 @@ static void external_scroller_state_set(void *data __UNUSED__,
 	}
 }
 
-static Eina_Bool external_scroller_param_set(void *data __UNUSED__,
+static Eina_Bool external_scroller_param_set(void *data EINA_UNUSED,
 		Evas_Object *obj, const Edje_External_Param *param)
 {
 	if (!strcmp(param->name, "content")
@@ -45,8 +45,8 @@ static Eina_Bool external_scroller_param_set(void *data __UNUSED__,
 	return EINA_FALSE;
 }
 
-static Eina_Bool external_scroller_param_get(void *data __UNUSED__,
-		const Evas_Object *obj __UNUSED__, Edje_External_Param *param)
+static Eina_Bool external_scroller_param_get(void *data EINA_UNUSED,
+		const Evas_Object *obj EINA_UNUSED, Edje_External_Param *param)
 {
 	if (!strcmp(param->name, "content"))
 	{
@@ -60,7 +60,7 @@ static Eina_Bool external_scroller_param_get(void *data __UNUSED__,
 	return EINA_FALSE;
 }
 
-static void * external_scroller_params_parse(void *data __UNUSED__, Evas_Object *obj,
+static void * external_scroller_params_parse(void *data EINA_UNUSED, Evas_Object *obj,
 		const Eina_List *params) {
 	Elm_Params_Scroller *mem;
 	Edje_External_Param *param;
@@ -79,7 +79,7 @@ static void * external_scroller_params_parse(void *data __UNUSED__, Evas_Object
 	return mem;
 }
 
-static Evas_Object *external_scroller_content_get(void *data __UNUSED__,
+static Evas_Object *external_scroller_content_get(void *data EINA_UNUSED,
 		const Evas_Object *obj, const char *content)
 {
 	if (!strcmp(content, "content"))

legacy/elementary/src/edje_externals/elm_segment_control.c

@@ -6,17 +6,17 @@ typedef struct _Elm_Params_Segment_Control
 } Elm_Params_Segment_Control;
 
 static void
-external_segment_control_state_set(void *data __UNUSED__,
-                                   Evas_Object *obj __UNUSED__,
-                                   const void *from_params __UNUSED__,
-                                   const void *to_params __UNUSED__,
-                                   float pos __UNUSED__)
+external_segment_control_state_set(void *data EINA_UNUSED,
+                                   Evas_Object *obj EINA_UNUSED,
+                                   const void *from_params EINA_UNUSED,
+                                   const void *to_params EINA_UNUSED,
+                                   float pos EINA_UNUSED)
 {
    /* FIXME: no params, no setting */
 }
 
 static Eina_Bool
-external_segment_control_param_set(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Edje_External_Param *param)
+external_segment_control_param_set(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Edje_External_Param *param)
 {
    ERR("unknown parameter '%s' of type '%s'",
        param->name, edje_external_param_type_str(param->type));
@@ -25,7 +25,7 @@ external_segment_control_param_set(void *data __UNUSED__, Evas_Object *obj __UNU
 }
 
 static Eina_Bool
-external_segment_control_param_get(void *data __UNUSED__, const Evas_Object *obj __UNUSED__, Edje_External_Param *param)
+external_segment_control_param_get(void *data EINA_UNUSED, const Evas_Object *obj EINA_UNUSED, Edje_External_Param *param)
 {
    ERR("unknown parameter '%s' of type '%s'",
        param->name, edje_external_param_type_str(param->type));
@@ -34,7 +34,7 @@ external_segment_control_param_get(void *data __UNUSED__, const Evas_Object *obj
 }
 
 static void *
-external_segment_control_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params __UNUSED__)
+external_segment_control_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params EINA_UNUSED)
 {
    Elm_Params_Segment_Control *mem;
    //Edje_External_Param *param;
@@ -52,8 +52,8 @@ external_segment_control_params_parse(void *data __UNUSED__, Evas_Object *obj __
    return mem;
 }
 
-static Evas_Object *external_segment_control_content_get(void *data __UNUSED__,
-                                                         const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+static Evas_Object *external_segment_control_content_get(void *data EINA_UNUSED,
+                                                         const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
 {
    ERR("No content.");
    return NULL;

legacy/elementary/src/edje_externals/elm_slider.c

@@ -19,7 +19,7 @@ typedef struct _Elm_Params_Slider
 } Elm_Params_Slider;
 
 static void
-external_slider_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+external_slider_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
 {
    const Elm_Params_Slider *p;
 
@@ -57,7 +57,7 @@ external_slider_state_set(void *data __UNUSED__, Evas_Object *obj, const void *f
 }
 
 static Eina_Bool
-external_slider_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+external_slider_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
 {
    if (!strcmp(param->name, "label"))
      {
@@ -153,7 +153,7 @@ external_slider_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ex
 }
 
 static Eina_Bool
-external_slider_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+external_slider_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
 {
    if (!strcmp(param->name, "label"))
      {
@@ -244,7 +244,7 @@ external_slider_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ex
 }
 
 static void *
-external_slider_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+external_slider_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params)
 {
    Elm_Params_Slider *mem;
    Edje_External_Param *param;
@@ -299,8 +299,8 @@ external_slider_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
    return mem;
 }
 
-static Evas_Object *external_slider_content_get(void *data __UNUSED__,
-		const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+static Evas_Object *external_slider_content_get(void *data EINA_UNUSED,
+		const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
 {
 	ERR("No content.");
 	return NULL;

legacy/elementary/src/edje_externals/elm_slideshow.c

@@ -16,7 +16,7 @@ static const char *transitions[] = { "fade", "black_fade", "horizontal",
 static const char *layout[] = { "fullscreen", "not_fullscreen", NULL};
 
 static void
-external_slideshow_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+external_slideshow_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
 {
    const Elm_Params_Slideshow *p;
 
@@ -37,7 +37,7 @@ external_slideshow_state_set(void *data __UNUSED__, Evas_Object *obj, const void
 }
 
 static Eina_Bool
-external_slideshow_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+external_slideshow_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
 {
    if (!strcmp(param->name, "timeout"))
      {
@@ -79,7 +79,7 @@ external_slideshow_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje
 }
 
 static Eina_Bool
-external_slideshow_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+external_slideshow_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
 {
    if (!strcmp(param->name, "timeout"))
      {
@@ -121,7 +121,7 @@ external_slideshow_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje
 }
 
 static void *
-external_slideshow_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+external_slideshow_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params)
 {
    Elm_Params_Slideshow *mem;
    Edje_External_Param *param;
@@ -156,15 +156,15 @@ external_slideshow_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED
    return mem;
 }
 
-static Evas_Object *external_slideshow_content_get(void *data __UNUSED__,
-		const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+static Evas_Object *external_slideshow_content_get(void *data EINA_UNUSED,
+		const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
 {
 	ERR("No content.");
 	return NULL;
 }
 
 static void
-external_slideshow_params_free(void *params __UNUSED__)
+external_slideshow_params_free(void *params EINA_UNUSED)
 {
    return;
 }

legacy/elementary/src/edje_externals/elm_spinner.c

@@ -14,7 +14,7 @@ typedef struct _Elm_Params_Spinner
 } Elm_Params_Spinner;
 
 static void
-external_spinner_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+external_spinner_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
 {
    const Elm_Params_Spinner *p;
 
@@ -44,7 +44,7 @@ external_spinner_state_set(void *data __UNUSED__, Evas_Object *obj, const void *
 }
 
 static Eina_Bool
-external_spinner_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+external_spinner_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
 {
    if (!strcmp(param->name, "label format"))
      {
@@ -106,7 +106,7 @@ external_spinner_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E
 }
 
 static Eina_Bool
-external_spinner_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+external_spinner_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
 {
    if (!strcmp(param->name, "label format"))
      {
@@ -168,7 +168,7 @@ external_spinner_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_E
 }
 
 static void *
-external_spinner_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+external_spinner_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params)
 {
    Elm_Params_Spinner *mem;
    Edje_External_Param *param;
@@ -212,8 +212,8 @@ external_spinner_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__
    return mem;
 }
 
-static Evas_Object *external_spinner_content_get(void *data __UNUSED__,
-		const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+static Evas_Object *external_spinner_content_get(void *data EINA_UNUSED,
+		const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
 {
 	ERR("No content.");
 	return NULL;

legacy/elementary/src/edje_externals/elm_thumb.c

@@ -26,7 +26,7 @@ _anim_setting_get(const char *anim_str)
 }
 
 static void
-external_thumb_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+external_thumb_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
 {
    const Elm_Params_Thumb *p;
 
@@ -43,7 +43,7 @@ external_thumb_state_set(void *data __UNUSED__, Evas_Object *obj, const void *fr
 }
 
 static Eina_Bool
-external_thumb_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+external_thumb_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
 {
    if (!strcmp(param->name, "animate"))
      {
@@ -63,7 +63,7 @@ external_thumb_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ext
 }
 
 static Eina_Bool
-external_thumb_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+external_thumb_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
 {
    if (!strcmp(param->name, "animate"))
      {
@@ -86,7 +86,7 @@ external_thumb_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ext
 }
 
 static void *
-external_thumb_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+external_thumb_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params)
 {
    Elm_Params_Thumb *mem;
    Edje_External_Param *param;
@@ -105,8 +105,8 @@ external_thumb_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
    return mem;
 }
 
-static Evas_Object *external_thumb_content_get(void *data __UNUSED__,
-		const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+static Evas_Object *external_thumb_content_get(void *data EINA_UNUSED,
+		const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
 {
 	ERR("No content.");
 	return NULL;
@@ -132,7 +132,7 @@ static Edje_External_Param_Info external_thumb_params[] =
 DEFINE_EXTERNAL_ICON_ADD(thumb, "thumb")
 
 static Evas_Object *
-external_thumb_add(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *edje, const Eina_List *params __UNUSED__, const char *part_name)
+external_thumb_add(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *edje, const Eina_List *params EINA_UNUSED, const char *part_name)
 {
    Evas_Object *parent, *obj;
    external_elm_init();

legacy/elementary/src/edje_externals/elm_toolbar.c

@@ -39,7 +39,7 @@ _toolbar_shrink_choices_setting_get(const char *shrink_mode_str)
 }
 
 static void
-external_toolbar_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+external_toolbar_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
 {
    const Elm_Params_Toolbar *p;
    Elm_Toolbar_Shrink_Mode shrink_mode;
@@ -78,7 +78,7 @@ external_toolbar_state_set(void *data __UNUSED__, Evas_Object *obj, const void *
 }
 
 static Eina_Bool
-external_toolbar_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+external_toolbar_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
 {
    Elm_Toolbar_Shrink_Mode shrink_mode;
 
@@ -153,7 +153,7 @@ external_toolbar_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E
 }
 
 static Eina_Bool
-external_toolbar_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+external_toolbar_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
 {
    if (!strcmp(param->name, "icon size"))
      {
@@ -229,7 +229,7 @@ external_toolbar_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_E
 }
 
 static void *
-external_toolbar_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+external_toolbar_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params)
 {
    Elm_Params_Toolbar *mem;
    Edje_External_Param *param;
@@ -278,8 +278,8 @@ external_toolbar_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__
    return mem;
 }
 
-static Evas_Object *external_toolbar_content_get(void *data __UNUSED__,
-		const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+static Evas_Object *external_toolbar_content_get(void *data EINA_UNUSED,
+		const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
 {
 	ERR("No content.");
 	return NULL;

legacy/elementary/src/edje_externals/elm_video.c

@@ -22,7 +22,7 @@ typedef struct _Elm_Params_Video
 } Elm_Params_Video;
 
 static void
-external_video_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+external_video_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
 {
    const Elm_Params_Video *p;
 
@@ -44,7 +44,7 @@ external_video_state_set(void *data __UNUSED__, Evas_Object *obj, const void *fr
 }
 
 static Eina_Bool
-external_video_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+external_video_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
 {
    if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
        && (!strcmp(param->name, "file")))
@@ -111,7 +111,7 @@ external_video_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ext
 }
 
 static Eina_Bool
-external_video_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+external_video_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
 {
    if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
        && (!strcmp(param->name, "file")))
@@ -181,7 +181,7 @@ external_video_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ext
 
    return EINA_FALSE; }
 
-static void * external_video_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+static void * external_video_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params)
 {
    Elm_Params_Video *mem;
    Edje_External_Param *param;
@@ -235,7 +235,7 @@ static void * external_video_params_parse(void *data __UNUSED__, Evas_Object *ob
    return mem;
 }
 
-static Evas_Object *external_video_content_get(void *data __UNUSED__, const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+static Evas_Object *external_video_content_get(void *data EINA_UNUSED, const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
 {
    ERR("No content.");
    return NULL;

legacy/elementary/src/edje_externals/elm_web.c

@@ -25,7 +25,7 @@ _zoom_mode_get(const char *zoom)
 }
 
 static void
-external_web_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+external_web_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
 {
    const Elm_Params_Web *p;
 
@@ -44,7 +44,7 @@ external_web_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from
 }
 
 static Eina_Bool
-external_web_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+external_web_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
 {
    if (!strcmp(param->name, "uri"))
      {
@@ -89,7 +89,7 @@ external_web_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Exter
 }
 
 static Eina_Bool
-external_web_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+external_web_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
 {
    if (!strcmp(param->name, "uri"))
      {
@@ -134,7 +134,7 @@ external_web_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Exter
 }
 
 static void *
-external_web_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+external_web_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params)
 {
    Elm_Params_Web *mem;
    Edje_External_Param *param;
@@ -177,7 +177,7 @@ external_web_params_free(void *params)
 }
 
 static Evas_Object *
-external_web_content_get(void *data __UNUSED__, const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+external_web_content_get(void *data EINA_UNUSED, const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
 {
    return NULL;
 }
@@ -192,7 +192,7 @@ static Edje_External_Param_Info external_web_params[] =
 };
 
 static Evas_Object *
-external_web_add(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *edje, const Eina_List *params __UNUSED__, const char *part_name)
+external_web_add(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *edje, const Eina_List *params EINA_UNUSED, const char *part_name)
 {
    Evas_Object *parent, *obj;
    external_elm_init();

legacy/elementary/src/edje_externals/private.h

@@ -54,20 +54,20 @@ _external_##type_name##_param_get(void *data, const Evas_Object *obj, Edje_Exter
    return external_##type_name##_param_get(data, obj, param); \
 }                                                       \
 static const char *                                     \
-external_##type_name##_label_get(void *data __UNUSED__) \
+external_##type_name##_label_get(void *data EINA_UNUSED) \
 {                                                       \
     return name;                                        \
 }                                                       \
                                                         \
 static void                                             \
-_external_##type_name##_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__) \
+_external_##type_name##_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED) \
 {                                                       \
    external_common_state_set(data, obj, from_params, to_params, pos); \
    external_##type_name##_state_set(data, obj, from_params, to_params, pos); \
 }                                                       \
                                                         \
 static void *                                           \
-_external_##type_name##_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params) \
+_external_##type_name##_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params) \
 {                                                       \
    void *mem = external_##type_name##_params_parse(data, obj, params); \
    external_common_params_parse(mem, data, obj, params); \
@@ -103,7 +103,7 @@ const Edje_External_Type external_##type_name##_type = {\
 
 #define DEFINE_EXTERNAL_TYPE_SIMPLE(type_name, name)    \
 static Evas_Object *                                \
-external_##type_name##_add(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *edje, const Eina_List *params __UNUSED__, const char *part_name) \
+external_##type_name##_add(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *edje, const Eina_List *params EINA_UNUSED, const char *part_name) \
 {									\
    Evas_Object *parent, *obj;						\
    external_elm_init();                                                 \
@@ -118,7 +118,7 @@ DEFINE_EXTERNAL_TYPE(type_name, name)
 
 #define DEFINE_EXTERNAL_ICON_ADD(type_name, name)                   \
 Evas_Object *                                                       \
-external_##type_name##_icon_add(void *data __UNUSED__, Evas *e) {   \
+external_##type_name##_icon_add(void *data EINA_UNUSED, Evas *e) {   \
    Evas_Object *ic;                                                 \
    int w = 20, h = 10;                                              \
                                                                     \

legacy/elementary/src/lib/elc_ctxpopup.c

@@ -665,18 +665,18 @@ _elm_ctxpopup_smart_sizing_eval(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 
 static void
 _on_parent_del(void *data,
-               Evas *e __UNUSED__,
-               Evas_Object *obj __UNUSED__,
-               void *event_info __UNUSED__)
+               Evas *e EINA_UNUSED,
+               Evas_Object *obj EINA_UNUSED,
+               void *event_info EINA_UNUSED)
 {
    evas_object_del(data);
 }
 
 static void
 _on_parent_move(void *data,
-                Evas *e __UNUSED__,
-                Evas_Object *obj __UNUSED__,
-                void *event_info __UNUSED__)
+                Evas *e EINA_UNUSED,
+                Evas_Object *obj EINA_UNUSED,
+                void *event_info EINA_UNUSED)
 {
    ELM_CTXPOPUP_DATA_GET(data, sd);
 
@@ -687,9 +687,9 @@ _on_parent_move(void *data,
 
 static void
 _on_parent_resize(void *data,
-                  Evas *e __UNUSED__,
-                  Evas_Object *obj __UNUSED__,
-                  void *event_info __UNUSED__)
+                  Evas *e EINA_UNUSED,
+                  Evas_Object *obj EINA_UNUSED,
+                  void *event_info EINA_UNUSED)
 {
    ELM_CTXPOPUP_DATA_GET(data, sd);
 
@@ -716,9 +716,9 @@ _parent_detach(Evas_Object *obj)
 
 static void
 _on_content_resized(void *data,
-                    Evas *e __UNUSED__,
-                    Evas_Object *obj __UNUSED__,
-                    void *event_info __UNUSED__)
+                    Evas *e EINA_UNUSED,
+                    Evas_Object *obj EINA_UNUSED,
+                    void *event_info EINA_UNUSED)
 {
    ELM_CTXPOPUP_DATA_GET(data, sd);
 
@@ -951,9 +951,9 @@ _item_signal_emit_hook(Elm_Object_Item *it,
 
 static void
 _bg_clicked_cb(void *data,
-               Evas_Object *obj __UNUSED__,
-               const char *emission __UNUSED__,
-               const char *source __UNUSED__)
+               Evas_Object *obj EINA_UNUSED,
+               const char *emission EINA_UNUSED,
+               const char *source EINA_UNUSED)
 {
    ELM_CTXPOPUP_DATA_GET(data, sd);
 
@@ -961,10 +961,10 @@ _bg_clicked_cb(void *data,
 }
 
 static void
-_on_show(void *data __UNUSED__,
-         Evas *e __UNUSED__,
+_on_show(void *data EINA_UNUSED,
+         Evas *e EINA_UNUSED,
          Evas_Object *obj,
-         void *event_info __UNUSED__)
+         void *event_info EINA_UNUSED)
 {
    ELM_CTXPOPUP_DATA_GET(obj, sd);
 
@@ -992,10 +992,10 @@ _on_show(void *data __UNUSED__,
 }
 
 static void
-_on_hide(void *data __UNUSED__,
-         Evas *e __UNUSED__,
+_on_hide(void *data EINA_UNUSED,
+         Evas *e EINA_UNUSED,
          Evas_Object *obj,
-         void *event_info __UNUSED__)
+         void *event_info EINA_UNUSED)
 {
    ELM_CTXPOPUP_DATA_GET(obj, sd);
 
@@ -1009,10 +1009,10 @@ _on_hide(void *data __UNUSED__,
 }
 
 static void
-_on_move(void *data __UNUSED__,
-         Evas *e __UNUSED__,
+_on_move(void *data EINA_UNUSED,
+         Evas *e EINA_UNUSED,
          Evas_Object *obj,
-         void *event_info __UNUSED__)
+         void *event_info EINA_UNUSED)
 {
    ELM_CTXPOPUP_DATA_GET(obj, sd);
 
@@ -1023,9 +1023,9 @@ _on_move(void *data __UNUSED__,
 
 static void
 _hide_finished_cb(void *data,
-                  Evas_Object *obj __UNUSED__,
-                  const char *emission __UNUSED__,
-                  const char *source __UNUSED__)
+                  Evas_Object *obj EINA_UNUSED,
+                  const char *emission EINA_UNUSED,
+                  const char *source EINA_UNUSED)
 {
    evas_object_hide(data);
    evas_object_smart_callback_call(data, SIG_DISMISSED, NULL);
@@ -1033,9 +1033,9 @@ _hide_finished_cb(void *data,
 
 static void
 _list_resize_cb(void *data,
-                Evas *e __UNUSED__,
-                Evas_Object *obj __UNUSED__,
-                void *event_info __UNUSED__)
+                Evas *e EINA_UNUSED,
+                Evas_Object *obj EINA_UNUSED,
+                void *event_info EINA_UNUSED)
 {
    ELM_CTXPOPUP_DATA_GET(data, sd);
 
@@ -1051,10 +1051,10 @@ _list_resize_cb(void *data,
 }
 
 static void
-_ctxpopup_restack_cb(void *data __UNUSED__,
-                     Evas *e __UNUSED__,
+_ctxpopup_restack_cb(void *data EINA_UNUSED,
+                     Evas *e EINA_UNUSED,
                      Evas_Object *obj,
-                     void *event_info __UNUSED__)
+                     void *event_info EINA_UNUSED)
 {
    ELM_CTXPOPUP_DATA_GET(obj, sd);
    evas_object_stack_below(sd->bg, obj);
@@ -1356,7 +1356,7 @@ elm_ctxpopup_item_append(Evas_Object *obj,
 }
 
 static void
-_item_wrap_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+_item_wrap_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Elm_Ctxpopup_Item *item = data;
    if (!item->wcb.org_func_cb) return;

legacy/elementary/src/lib/elc_fileselector.c

@@ -139,8 +139,8 @@ _elm_fileselector_smart_theme(Eo *obj, void *_pd, va_list *list)
 /***  GENLIST/GENGRID "MODEL"  ***/
 static char *
 _itc_text_get(void *data,
-              Evas_Object *obj   __UNUSED__,
-              const char *source __UNUSED__)
+              Evas_Object *obj   EINA_UNUSED,
+              const char *source EINA_UNUSED)
 {
    return elm_entry_utf8_to_markup
             (ecore_file_file_get(data)); /* NOTE this will be free()'d by
@@ -148,7 +148,7 @@ _itc_text_get(void *data,
 }
 
 static Evas_Object *
-_itc_icon_folder_get(void *data __UNUSED__,
+_itc_icon_folder_get(void *data EINA_UNUSED,
                      Evas_Object *obj,
                      const char *source)
 {
@@ -202,7 +202,7 @@ _itc_icon_image_get(void *data,
 }
 
 static Evas_Object *
-_itc_icon_file_get(void *data __UNUSED__,
+_itc_icon_file_get(void *data EINA_UNUSED,
                    Evas_Object *obj,
                    const char *source)
 {
@@ -228,16 +228,16 @@ _itc_icon_file_get(void *data __UNUSED__,
 }
 
 static Eina_Bool
-_itc_state_get(void *data         __UNUSED__,
-               Evas_Object *obj   __UNUSED__,
-               const char *source __UNUSED__)
+_itc_state_get(void *data         EINA_UNUSED,
+               Evas_Object *obj   EINA_UNUSED,
+               const char *source EINA_UNUSED)
 {
    return EINA_FALSE;
 }
 
 static void
 _itc_del(void *data,
-         Evas_Object *obj __UNUSED__)
+         Evas_Object *obj EINA_UNUSED)
 {
    eina_stringshare_del(data);
 }
@@ -323,7 +323,7 @@ _check_mime_type_filter(const Elm_Fileselector_Filter *filter,
 
 static Eina_Bool
 _ls_filter_cb(void *data,
-              Eio_File *handler __UNUSED__,
+              Eio_File *handler EINA_UNUSED,
               const Eina_File_Direct_Info *info)
 {
    Listing_Request *lreq = data;
@@ -560,7 +560,7 @@ _listing_request_cleanup(Listing_Request *lreq)
 }
 
 static void
-_ls_done_cb(void *data, Eio_File *handler __UNUSED__)
+_ls_done_cb(void *data, Eio_File *handler EINA_UNUSED)
 {
    Listing_Request *lreq = data;
 
@@ -573,7 +573,7 @@ _ls_done_cb(void *data, Eio_File *handler __UNUSED__)
 }
 
 static void
-_ls_error_cb(void *data, Eio_File *handler, int error __UNUSED__)
+_ls_error_cb(void *data, Eio_File *handler, int error EINA_UNUSED)
 {
    Listing_Request *lreq = data;
 
@@ -627,7 +627,7 @@ _populate(Evas_Object *obj,
 
 static void
 _on_list_expanded(void *data,
-                  Evas_Object *obj __UNUSED__,
+                  Evas_Object *obj EINA_UNUSED,
                   void *event_info)
 {
    Elm_Object_Item *it = event_info;
@@ -637,8 +637,8 @@ _on_list_expanded(void *data,
 }
 
 static void
-_on_list_contracted(void *data       __UNUSED__,
-                    Evas_Object *obj __UNUSED__,
+_on_list_contracted(void *data       EINA_UNUSED,
+                    Evas_Object *obj EINA_UNUSED,
                     void *event_info)
 {
    Elm_Object_Item *it = event_info;
@@ -647,8 +647,8 @@ _on_list_contracted(void *data       __UNUSED__,
 }
 
 static void
-_on_list_expand_req(void *data       __UNUSED__,
-                    Evas_Object *obj __UNUSED__,
+_on_list_expand_req(void *data       EINA_UNUSED,
+                    Evas_Object *obj EINA_UNUSED,
                     void *event_info)
 {
    Elm_Object_Item *it = event_info;
@@ -657,8 +657,8 @@ _on_list_expand_req(void *data       __UNUSED__,
 }
 
 static void
-_on_list_contract_req(void *data       __UNUSED__,
-                      Evas_Object *obj __UNUSED__,
+_on_list_contract_req(void *data       EINA_UNUSED,
+                      Evas_Object *obj EINA_UNUSED,
                       void *event_info)
 {
    Elm_Object_Item *it = event_info;
@@ -686,7 +686,7 @@ _populate_do(void *data)
 
 static void
 _on_item_double_clicked(void *data,
-                  Evas_Object *obj __UNUSED__,
+                  Evas_Object *obj EINA_UNUSED,
                   void *event_info)
 {
    //This event_info could be a list or gengrid item
@@ -722,7 +722,7 @@ _on_item_double_clicked(void *data,
 
 static void
 _on_item_activated(void *data,
-                   Evas_Object *obj __UNUSED__,
+                   Evas_Object *obj EINA_UNUSED,
                    void *event_info)
 {
    //This event_info could be a list or gengrid item
@@ -769,7 +769,7 @@ _clear_selections(Elm_Fileselector_Smart_Data *sd, Elm_Object_Item *last_selecte
 
 static void
 _on_item_selected(void *data,
-                  Evas_Object *obj __UNUSED__,
+                  Evas_Object *obj EINA_UNUSED,
                   void *event_info)
 {
    //This event_info could be a list or gengrid item
@@ -874,7 +874,7 @@ _on_item_selected(void *data,
 
 static void
 _on_item_unselected(void *data,
-                    Evas_Object *obj __UNUSED__,
+                    Evas_Object *obj EINA_UNUSED,
                     void *event_info)
 {
    Eina_List *li, *l;
@@ -916,8 +916,8 @@ _on_item_unselected(void *data,
 
 static void
 _on_dir_up(void *data,
-           Evas_Object *obj __UNUSED__,
-           void *event_info __UNUSED__)
+           Evas_Object *obj EINA_UNUSED,
+           void *event_info EINA_UNUSED)
 {
    Evas_Object *fs = data;
    char *parent;
@@ -931,8 +931,8 @@ _on_dir_up(void *data,
 
 static void
 _home(void *data,
-      Evas_Object *obj __UNUSED__,
-      void *event_info __UNUSED__)
+      Evas_Object *obj EINA_UNUSED,
+      void *event_info EINA_UNUSED)
 {
    Evas_Object *fs = data;
 
@@ -942,7 +942,7 @@ _home(void *data,
 static void
 _current_filter_changed(void *data,
                         Evas_Object *obj,
-                        void *event_info __UNUSED__)
+                        void *event_info EINA_UNUSED)
 {
    Elm_Fileselector_Filter *filter = data;
 
@@ -956,8 +956,8 @@ _current_filter_changed(void *data,
 
 static void
 _ok(void *data,
-    Evas_Object *obj __UNUSED__,
-    void *event_info __UNUSED__)
+    Evas_Object *obj EINA_UNUSED,
+    void *event_info EINA_UNUSED)
 {
    const char *name;
    const char *selection = NULL;
@@ -982,8 +982,8 @@ _ok(void *data,
 
 static void
 _canc(void *data,
-      Evas_Object *obj __UNUSED__,
-      void *event_info __UNUSED__)
+      Evas_Object *obj EINA_UNUSED,
+      void *event_info EINA_UNUSED)
 {
    Evas_Object *fs = data;
 
@@ -991,9 +991,9 @@ _canc(void *data,
 }
 
 static void
-_on_text_clicked(void *data __UNUSED__,
+_on_text_clicked(void *data EINA_UNUSED,
                  Evas_Object *obj,
-                 void *event_info __UNUSED__)
+                 void *event_info EINA_UNUSED)
 {
    ELM_FILESELECTOR_DATA_GET(data, sd);
 
@@ -1012,7 +1012,7 @@ _on_text_clicked(void *data __UNUSED__,
 static void
 _on_text_activated(void *data,
                    Evas_Object *obj,
-                   void *event_info __UNUSED__)
+                   void *event_info EINA_UNUSED)
 {
    Evas_Object *fs = data;
    const char *p, *path;
@@ -1093,8 +1093,8 @@ end:
 
 static void
 _on_text_unfocused(void *data,
-                   Evas_Object *obj __UNUSED__,
-                   void *event_info __UNUSED__)
+                   Evas_Object *obj EINA_UNUSED,
+                   void *event_info EINA_UNUSED)
 {
    ELM_FILESELECTOR_DATA_GET(data, sd);
    _anchors_do(data, sd->path);
@@ -1102,7 +1102,7 @@ _on_text_unfocused(void *data,
 
 static void
 _anchor_clicked(void *data,
-                Evas_Object *obj __UNUSED__,
+                Evas_Object *obj EINA_UNUSED,
                 void *event_info)
 {
    Elm_Entry_Anchor_Info *info = event_info;
@@ -1762,7 +1762,7 @@ elm_fileselector_multi_select_set(Evas_Object *obj, Eina_Bool multi)
 }
 
 static void
-_multi_select_set(Eo *obj __UNUSED__, void *_pd, va_list *list __UNUSED__)
+_multi_select_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list EINA_UNUSED)
 {
    Eina_Bool multi = va_arg(*list, int);
    Elm_Fileselector_Smart_Data *sd = _pd;
@@ -1921,7 +1921,7 @@ elm_fileselector_selected_paths_get(const Evas_Object* obj)
 }
 
 static void
-_selected_paths_get(Eo *obj __UNUSED__, void *_pd, va_list *list)
+_selected_paths_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 {
    const Eina_List **ret = va_arg(*list, const Eina_List**);
    Elm_Fileselector_Smart_Data *sd = _pd;
@@ -2093,7 +2093,7 @@ elm_fileselector_hidden_visible_set(Evas_Object *obj, Eina_Bool visible)
 }
 
 static void
-_hidden_visible_set(Eo *obj __UNUSED__, void *_pd, va_list *list EINA_UNUSED)
+_hidden_visible_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list EINA_UNUSED)
 {
    Eina_Bool visible = va_arg(*list, int);
    Elm_Fileselector_Smart_Data *sd = _pd;
@@ -2134,7 +2134,7 @@ elm_fileselector_thumbnail_size_set(Evas_Object *obj,
 }
 
 static void
-_thumbnail_size_set(Eo *obj __UNUSED__, void *_pd, va_list *list EINA_UNUSED)
+_thumbnail_size_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list EINA_UNUSED)
 {
    Evas_Coord w = va_arg(*list, Evas_Coord);
    Evas_Coord h = va_arg(*list, Evas_Coord);
@@ -2182,7 +2182,7 @@ elm_fileselector_sort_method_set(Evas_Object *obj, Elm_Fileselector_Sort sort)
 }
 
 static void
-_sort_method_set(Eo *obj __UNUSED__, void *_pd, va_list *list EINA_UNUSED)
+_sort_method_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list EINA_UNUSED)
 {
    Elm_Fileselector_Sort sort = va_arg(*list, Elm_Fileselector_Sort);
    Elm_Fileselector_Smart_Data *sd = _pd;

legacy/elementary/src/lib/elc_fileselector_button.c

@@ -68,7 +68,7 @@ _elm_fileselector_button_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *li
 
 static void
 _selection_done(void *data,
-                Evas_Object *obj __UNUSED__,
+                Evas_Object *obj EINA_UNUSED,
                 void *event_info)
 {
    Elm_Fileselector_Button_Smart_Data *sd = data;
@@ -164,8 +164,8 @@ _activate(Elm_Fileselector_Button_Smart_Data *sd)
 
 static void
 _button_clicked(void *data,
-                Evas_Object *obj __UNUSED__,
-                void *event_info __UNUSED__)
+                Evas_Object *obj EINA_UNUSED,
+                void *event_info EINA_UNUSED)
 {
    _activate(data);
 }

legacy/elementary/src/lib/elc_fileselector_entry.c

@@ -43,7 +43,7 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] =
 
 #define SIG_FWD(name)                                                       \
   static void                                                               \
-  _##name##_fwd(void *data, Evas_Object * obj __UNUSED__, void *event_info) \
+  _##name##_fwd(void *data, Evas_Object * obj EINA_UNUSED, void *event_info) \
   {                                                                         \
      evas_object_smart_callback_call(data, SIG_##name, event_info);         \
   }
@@ -62,7 +62,7 @@ SIG_FWD(UNPRESSED)
 
 static void
 _FILE_CHOSEN_fwd(void *data,
-                 Evas_Object *obj __UNUSED__,
+                 Evas_Object *obj EINA_UNUSED,
                  void *event_info)
 {
    const char *file = event_info;
@@ -79,7 +79,7 @@ _FILE_CHOSEN_fwd(void *data,
 
 static void
 _ACTIVATED_fwd(void *data,
-               Evas_Object *obj __UNUSED__,
+               Evas_Object *obj EINA_UNUSED,
                void *event_info)
 {
    const char *file;

legacy/elementary/src/lib/elc_hoversel.c

@@ -78,16 +78,16 @@ _elm_hoversel_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 
 static void
 _on_hover_clicked(void *data,
-                  Evas_Object *obj __UNUSED__,
-                  void *event_info __UNUSED__)
+                  Evas_Object *obj EINA_UNUSED,
+                  void *event_info EINA_UNUSED)
 {
    elm_hoversel_hover_end(data);
 }
 
 static void
 _on_item_clicked(void *data,
-                 Evas_Object *obj __UNUSED__,
-                 void *event_info __UNUSED__)
+                 Evas_Object *obj EINA_UNUSED,
+                 void *event_info EINA_UNUSED)
 {
    Elm_Hoversel_Item *item = data;
    Evas_Object *obj2 = WIDGET(item);
@@ -185,17 +185,17 @@ _activate(Evas_Object *obj)
 
 static void
 _on_clicked(void *data,
-            Evas_Object *obj __UNUSED__,
-            void *event_info __UNUSED__)
+            Evas_Object *obj EINA_UNUSED,
+            void *event_info EINA_UNUSED)
 {
    _activate(data);
 }
 
 static void
 _on_parent_del(void *data,
-               Evas *e __UNUSED__,
-               Evas_Object *obj __UNUSED__,
-               void *event_info __UNUSED__)
+               Evas *e EINA_UNUSED,
+               Evas_Object *obj EINA_UNUSED,
+               void *event_info EINA_UNUSED)
 {
    elm_hoversel_hover_parent_set(data, NULL);
 }
@@ -250,7 +250,7 @@ _item_del_pre_hook(Elm_Object_Item *it)
 }
 
 static void
-_elm_hoversel_smart_add(Eo *obj, void *_pd __UNUSED__,
+_elm_hoversel_smart_add(Eo *obj, void *_pd EINA_UNUSED,
                         va_list *list EINA_UNUSED)
 {
    eo_do_super(obj, MY_CLASS, evas_obj_smart_add());

legacy/elementary/src/lib/elc_multibuttonentry.c

@@ -472,8 +472,8 @@ _button_select(Evas_Object *obj,
 static void
 _button_clicked_cb(void *data,
                    Evas_Object *obj,
-                   const char *emission __UNUSED__,
-                   const char *source __UNUSED__)
+                   const char *emission EINA_UNUSED,
+                   const char *source EINA_UNUSED)
 {
    Elm_Multibuttonentry_Item *item = NULL;
 
@@ -496,8 +496,8 @@ _button_clicked_cb(void *data,
 static void
 _button_deleted_cb(void *data,
                    Evas_Object *obj,
-                   const char *emission __UNUSED__,
-                   const char *source __UNUSED__)
+                   const char *emission EINA_UNUSED,
+                   const char *source EINA_UNUSED)
 {
    Eina_List *l;
    Elm_Multibuttonentry_Item *item = NULL;
@@ -886,8 +886,8 @@ _elm_multibuttonentry_smart_sizing_eval(Eo *obj, void *_pd, va_list *list EINA_U
 static void
 _mouse_clicked_signal_cb(void *data,
                          Evas_Object *obj,
-                         const char *emission __UNUSED__,
-                         const char *source __UNUSED__)
+                         const char *emission EINA_UNUSED,
+                         const char *source EINA_UNUSED)
 {
    Elm_Multibuttonentry_Smart_Data *sd = data;
 
@@ -904,9 +904,9 @@ _mouse_clicked_signal_cb(void *data,
 
 static void
 _box_resize_cb(void *data,
-               Evas *evas __UNUSED__,
-               Evas_Object *obj __UNUSED__,
-               void *event __UNUSED__)
+               Evas *evas EINA_UNUSED,
+               Evas_Object *obj EINA_UNUSED,
+               void *event EINA_UNUSED)
 {
    ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
    Evas_Coord w, h;
@@ -926,9 +926,9 @@ _box_resize_cb(void *data,
 
 static void
 _entry_resize_cb(void *data,
-                 Evas *e __UNUSED__,
-                 Evas_Object *obj __UNUSED__,
-                 void *event_info __UNUSED__)
+                 Evas *e EINA_UNUSED,
+                 Evas_Object *obj EINA_UNUSED,
+                 void *event_info EINA_UNUSED)
 {
    ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
    Evas_Coord en_x, en_y, en_w, en_h;
@@ -941,8 +941,8 @@ _entry_resize_cb(void *data,
 
 static void
 _entry_changed_cb(void *data,
-                  Evas_Object *obj __UNUSED__,
-                  void *event_info __UNUSED__)
+                  Evas_Object *obj EINA_UNUSED,
+                  void *event_info EINA_UNUSED)
 {
    ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
    const char *str;
@@ -953,8 +953,8 @@ _entry_changed_cb(void *data,
 
 static void
 _entry_focus_in_cb(void *data,
-                   Evas_Object *obj __UNUSED__,
-                   void *event_info __UNUSED__)
+                   Evas_Object *obj EINA_UNUSED,
+                   void *event_info EINA_UNUSED)
 {
    Elm_Multibuttonentry_Item *item = NULL;
    ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
@@ -969,8 +969,8 @@ _entry_focus_in_cb(void *data,
 
 static void
 _entry_focus_out_cb(void *data,
-                    Evas_Object *obj __UNUSED__,
-                    void *event_info __UNUSED__)
+                    Evas_Object *obj EINA_UNUSED,
+                    void *event_info EINA_UNUSED)
 {
    ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
    const char *str;
@@ -982,8 +982,8 @@ _entry_focus_out_cb(void *data,
 
 static void
 _entry_clicked_cb(void *data,
-                  Evas_Object *obj __UNUSED__,
-                  void *event_info __UNUSED__)
+                  Evas_Object *obj EINA_UNUSED,
+                  void *event_info EINA_UNUSED)
 {
    ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
 
@@ -993,8 +993,8 @@ _entry_clicked_cb(void *data,
 
 static void
 _layout_key_up_cb(void *data,
-                  Evas *e __UNUSED__,
-                  Evas_Object *obj __UNUSED__,
+                  Evas *e EINA_UNUSED,
+                  Evas_Object *obj EINA_UNUSED,
                   void *event_info)
 {
    Elm_Multibuttonentry_Item *item = NULL;
@@ -1031,8 +1031,8 @@ _layout_key_up_cb(void *data,
 
 static void
 _entry_key_down_cb(void *data,
-                   Evas *e __UNUSED__,
-                   Evas_Object *obj __UNUSED__,
+                   Evas *e EINA_UNUSED,
+                   Evas_Object *obj EINA_UNUSED,
                    void *event_info)
 {
    ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
@@ -1045,8 +1045,8 @@ _entry_key_down_cb(void *data,
 
 static void
 _entry_key_up_cb(void *data,
-                 Evas *e __UNUSED__,
-                 Evas_Object *obj __UNUSED__,
+                 Evas *e EINA_UNUSED,
+                 Evas_Object *obj EINA_UNUSED,
                  void *event_info)
 {
    ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
@@ -1267,7 +1267,7 @@ _item_max_height_calculate(Evas_Object *box,
 static void
 _box_layout_cb(Evas_Object *o,
                Evas_Object_Box_Data *priv,
-               void *data __UNUSED__)
+               void *data EINA_UNUSED)
 {
    Evas_Coord cw = 0, ch = 0, cmaxh = 0, obj_index = 0;
    Evas_Coord x, y, w, h, xx, yy;
@@ -1446,7 +1446,7 @@ _elm_multibuttonentry_smart_text_get(Eo *obj, void *_pd, va_list *list)
 }
 
 static char *
-_access_info_cb(void *data __UNUSED__, Evas_Object *obj)
+_access_info_cb(void *data EINA_UNUSED, Evas_Object *obj)
 {
    char *ret;
    Eina_Strbuf *buf;

legacy/elementary/src/lib/elc_naviframe.c

@@ -35,7 +35,7 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
 
 static const char SIG_CLICKED[] = "clicked";
 
-static void _on_item_back_btn_clicked(void *data, Evas_Object *obj, void *event_info __UNUSED__);
+static void _on_item_back_btn_clicked(void *data, Evas_Object *obj, void *event_info EINA_UNUSED);
 
 static void
 _resize_object_reset(Evas_Object *obj, Elm_Naviframe_Item *it)
@@ -80,9 +80,9 @@ _elm_naviframe_smart_translate(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 
 static void
 _item_content_del_cb(void *data,
-                     Evas *e __UNUSED__,
-                     Evas_Object *obj __UNUSED__,
-                     void *event_info __UNUSED__)
+                     Evas *e EINA_UNUSED,
+                     Evas_Object *obj EINA_UNUSED,
+                     void *event_info EINA_UNUSED)
 {
    Elm_Naviframe_Item *it = data;
 
@@ -92,9 +92,9 @@ _item_content_del_cb(void *data,
 
 static void
 _item_title_prev_btn_del_cb(void *data,
-                            Evas *e __UNUSED__,
-                            Evas_Object *obj __UNUSED__,
-                            void *event_info __UNUSED__)
+                            Evas *e EINA_UNUSED,
+                            Evas_Object *obj EINA_UNUSED,
+                            void *event_info EINA_UNUSED)
 {
    Elm_Naviframe_Item *it = data;
 
@@ -104,9 +104,9 @@ _item_title_prev_btn_del_cb(void *data,
 
 static void
 _item_title_next_btn_del_cb(void *data,
-                            Evas *e __UNUSED__,
-                            Evas_Object *obj __UNUSED__,
-                            void *event_info __UNUSED__)
+                            Evas *e EINA_UNUSED,
+                            Evas_Object *obj EINA_UNUSED,
+                            void *event_info EINA_UNUSED)
 {
    Elm_Naviframe_Item *it = data;
 
@@ -116,9 +116,9 @@ _item_title_next_btn_del_cb(void *data,
 
 static void
 _item_title_icon_del_cb(void *data,
-                        Evas *e __UNUSED__,
-                        Evas_Object *obj __UNUSED__,
-                        void *event_info __UNUSED__)
+                        Evas *e EINA_UNUSED,
+                        Evas_Object *obj EINA_UNUSED,
+                        void *event_info EINA_UNUSED)
 {
    Elm_Naviframe_Item *it = data;
 
@@ -128,9 +128,9 @@ _item_title_icon_del_cb(void *data,
 
 static void
 _title_content_del(void *data,
-                   Evas *e __UNUSED__,
-                   Evas_Object *obj __UNUSED__,
-                   void *event_info __UNUSED__)
+                   Evas *e EINA_UNUSED,
+                   Evas_Object *obj EINA_UNUSED,
+                   void *event_info EINA_UNUSED)
 {
    char buf[1024];
    Elm_Naviframe_Content_Item_Pair *pair = data;
@@ -332,7 +332,7 @@ _elm_naviframe_smart_theme(Eo *obj, void *_pd, va_list *list)
 }
 
 static char *
-_access_info_cb(void *data, Evas_Object *obj __UNUSED__)
+_access_info_cb(void *data, Evas_Object *obj EINA_UNUSED)
 {
    Elm_Naviframe_Item *nit;
    Evas_Object *layout;
@@ -876,7 +876,7 @@ _elm_naviframe_smart_sizing_eval(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 static void
 _on_item_back_btn_clicked(void *data,
                           Evas_Object *obj,
-                          void *event_info __UNUSED__)
+                          void *event_info EINA_UNUSED)
 {
    /* Since edje has the event queue, clicked event could be happend
       multiple times on some heavy environment. This callback del will
@@ -1024,9 +1024,9 @@ _elm_naviframe_smart_content_unset(Eo *obj, void *_pd EINA_UNUSED, va_list *list
 
 static void
 _on_item_title_clicked(void *data,
-                       Evas_Object *obj __UNUSED__,
-                       const char *emission __UNUSED__,
-                       const char *source __UNUSED__)
+                       Evas_Object *obj EINA_UNUSED,
+                       const char *emission EINA_UNUSED,
+                       const char *source EINA_UNUSED)
 {
    Elm_Naviframe_Item *it = data;
 
@@ -1037,9 +1037,9 @@ _on_item_title_clicked(void *data,
  */
 static void
 _on_item_push_finished(void *data,
-                       Evas_Object *obj __UNUSED__,
-                       const char *emission __UNUSED__,
-                       const char *source __UNUSED__)
+                       Evas_Object *obj EINA_UNUSED,
+                       const char *emission EINA_UNUSED,
+                       const char *source EINA_UNUSED)
 {
    Elm_Naviframe_Item *it = data;
 
@@ -1059,9 +1059,9 @@ _on_item_push_finished(void *data,
  */
 static void
 _on_item_pop_finished(void *data,
-                      Evas_Object *obj __UNUSED__,
-                      const char *emission __UNUSED__,
-                      const char *source __UNUSED__)
+                      Evas_Object *obj EINA_UNUSED,
+                      const char *emission EINA_UNUSED,
+                      const char *source EINA_UNUSED)
 {
    Elm_Naviframe_Item *it = data;
 
@@ -1079,9 +1079,9 @@ _on_item_pop_finished(void *data,
  */
 static void
 _on_item_show_finished(void *data,
-                       Evas_Object *obj __UNUSED__,
-                       const char *emission __UNUSED__,
-                       const char *source __UNUSED__)
+                       Evas_Object *obj EINA_UNUSED,
+                       const char *emission EINA_UNUSED,
+                       const char *source EINA_UNUSED)
 {
    Elm_Naviframe_Item *it = data;
 
@@ -1101,9 +1101,9 @@ _on_item_show_finished(void *data,
 
 static void
 _on_item_size_hints_changed(void *data,
-                            Evas *e __UNUSED__,
-                            Evas_Object *obj __UNUSED__,
-                            void *event_info __UNUSED__)
+                            Evas *e EINA_UNUSED,
+                            Evas_Object *obj EINA_UNUSED,
+                            void *event_info EINA_UNUSED)
 {
    elm_layout_sizing_eval(data);
 }
@@ -1125,7 +1125,7 @@ _item_dispmode_set(Elm_Naviframe_Item *it, Evas_Display_Mode dispmode)
 }
 
 static char *
-_access_prev_btn_info_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__)
+_access_prev_btn_info_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED)
 {
    return strdup(E_("Back"));
 }
@@ -1218,8 +1218,8 @@ _item_new(Evas_Object *obj,
 }
 
 static void
-_on_obj_size_hints_changed(void *data __UNUSED__, Evas *e __UNUSED__,
-                           Evas_Object *obj, void *event_info __UNUSED__)
+_on_obj_size_hints_changed(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
+                           Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    Elm_Naviframe_Item *it;
    Evas_Display_Mode dispmode;

legacy/elementary/src/lib/elc_player.c

@@ -203,8 +203,8 @@ _elm_player_smart_sizing_eval(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA
 
 static void
 _update_slider(void *data,
-               Evas_Object *obj __UNUSED__,
-               void *event_info __UNUSED__)
+               Evas_Object *obj EINA_UNUSED,
+               void *event_info EINA_UNUSED)
 {
    double pos, length;
    Eina_Bool seekable;
@@ -236,8 +236,8 @@ _update_frame(void *data,
 
 static void
 _update_position(void *data,
-                 Evas_Object *obj __UNUSED__,
-                 void *event_info __UNUSED__)
+                 Evas_Object *obj EINA_UNUSED,
+                 void *event_info EINA_UNUSED)
 {
    double pos;
    ELM_PLAYER_DATA_GET(data, sd);
@@ -249,8 +249,8 @@ _update_position(void *data,
 
 static void
 _drag_start(void *data,
-            Evas_Object *obj __UNUSED__,
-            void *event_info __UNUSED__)
+            Evas_Object *obj EINA_UNUSED,
+            void *event_info EINA_UNUSED)
 {
    ELM_PLAYER_DATA_GET(data, sd);
    sd->dragging = EINA_TRUE;
@@ -258,8 +258,8 @@ _drag_start(void *data,
 
 static void
 _drag_stop(void *data,
-            Evas_Object *obj __UNUSED__,
-            void *event_info __UNUSED__)
+            Evas_Object *obj EINA_UNUSED,
+            void *event_info EINA_UNUSED)
 {
    ELM_PLAYER_DATA_GET(data, sd);
    sd->dragging = EINA_FALSE;
@@ -267,8 +267,8 @@ _drag_stop(void *data,
 
 static void
 _update_volume(void *data,
-                 Evas_Object *obj __UNUSED__,
-                 void *event_info __UNUSED__)
+                 Evas_Object *obj EINA_UNUSED,
+                 void *event_info EINA_UNUSED)
 {
    double vol;
    ELM_PLAYER_DATA_GET(data, sd);
@@ -280,8 +280,8 @@ _update_volume(void *data,
 
 static void
 _forward(void *data,
-         Evas_Object *obj __UNUSED__,
-         void *event_info __UNUSED__)
+         Evas_Object *obj EINA_UNUSED,
+         void *event_info EINA_UNUSED)
 {
    double pos, length;
    ELM_PLAYER_DATA_GET(data, sd);
@@ -298,8 +298,8 @@ _forward(void *data,
 
 static void
 _info(void *data,
-      Evas_Object *obj __UNUSED__,
-      void *event_info __UNUSED__)
+      Evas_Object *obj EINA_UNUSED,
+      void *event_info EINA_UNUSED)
 {
    elm_layout_signal_emit(data, "elm,button,info", "elm");
    evas_object_smart_callback_call(data, SIG_INFO_CLICKED, NULL);
@@ -307,8 +307,8 @@ _info(void *data,
 
 static void
 _next(void *data,
-      Evas_Object *obj __UNUSED__,
-      void *event_info __UNUSED__)
+      Evas_Object *obj EINA_UNUSED,
+      void *event_info EINA_UNUSED)
 {
    elm_layout_signal_emit(data, "elm,button,next", "elm");
    evas_object_smart_callback_call(data, SIG_NEXT_CLICKED, NULL);
@@ -316,8 +316,8 @@ _next(void *data,
 
 static void
 _pause(void *data,
-       Evas_Object *obj __UNUSED__,
-       void *event_info __UNUSED__)
+       Evas_Object *obj EINA_UNUSED,
+       void *event_info EINA_UNUSED)
 {
    ELM_PLAYER_DATA_GET(data, sd);
 
@@ -328,8 +328,8 @@ _pause(void *data,
 
 static void
 _play(void *data,
-      Evas_Object *obj __UNUSED__,
-      void *event_info __UNUSED__)
+      Evas_Object *obj EINA_UNUSED,
+      void *event_info EINA_UNUSED)
 {
    ELM_PLAYER_DATA_GET(data, sd);
 
@@ -340,8 +340,8 @@ _play(void *data,
 
 static void
 _prev(void *data,
-      Evas_Object *obj __UNUSED__,
-      void *event_info __UNUSED__)
+      Evas_Object *obj EINA_UNUSED,
+      void *event_info EINA_UNUSED)
 {
    evas_object_smart_callback_call(data, SIG_PREV_CLICKED, NULL);
    elm_layout_signal_emit(data, "elm,button,prev", "elm");
@@ -349,8 +349,8 @@ _prev(void *data,
 
 static void
 _rewind(void *data,
-        Evas_Object *obj __UNUSED__,
-        void *event_info __UNUSED__)
+        Evas_Object *obj EINA_UNUSED,
+        void *event_info EINA_UNUSED)
 {
    double pos;
    ELM_PLAYER_DATA_GET(data, sd);
@@ -366,8 +366,8 @@ _rewind(void *data,
 
 static void
 _stop(void *data,
-      Evas_Object *obj __UNUSED__,
-      void *event_info __UNUSED__)
+      Evas_Object *obj EINA_UNUSED,
+      void *event_info EINA_UNUSED)
 {
    elm_layout_signal_emit(data, "elm,button,stop", "elm");
    evas_object_smart_callback_call(data, SIG_STOP_CLICKED, NULL);
@@ -375,8 +375,8 @@ _stop(void *data,
 
 static void
 _eject(void *data,
-       Evas_Object *obj __UNUSED__,
-       void *event_info __UNUSED__)
+       Evas_Object *obj EINA_UNUSED,
+       void *event_info EINA_UNUSED)
 {
    ELM_PLAYER_DATA_GET(data, sd);
 
@@ -404,8 +404,8 @@ _mute_toggle(Evas_Object *obj)
 
 static void
 _volume(void *data,
-        Evas_Object *obj __UNUSED__,
-        void *event_info __UNUSED__)
+        Evas_Object *obj EINA_UNUSED,
+        void *event_info EINA_UNUSED)
 {
    elm_layout_signal_emit(data, "elm,button,volume", "elm");
    _mute_toggle(data);
@@ -414,8 +414,8 @@ _volume(void *data,
 
 static void
 _mute(void *data,
-      Evas_Object *obj __UNUSED__,
-      void *event_info __UNUSED__)
+      Evas_Object *obj EINA_UNUSED,
+      void *event_info EINA_UNUSED)
 {
    elm_layout_signal_emit(data, "elm,button,mute", "elm");
    _mute_toggle(data);
@@ -424,16 +424,16 @@ _mute(void *data,
 
 static void
 _play_started(void *data,
-              Evas_Object *obj __UNUSED__,
-              void *event_info __UNUSED__)
+              Evas_Object *obj EINA_UNUSED,
+              void *event_info EINA_UNUSED)
 {
    elm_layout_signal_emit(data, "elm,player,play", "elm");
 }
 
 static void
 _play_finished(void *data,
-               Evas_Object *obj __UNUSED__,
-               void *event_info __UNUSED__)
+               Evas_Object *obj EINA_UNUSED,
+               void *event_info EINA_UNUSED)
 {
    elm_layout_signal_emit(data, "elm,player,pause", "elm");
 }
@@ -461,9 +461,9 @@ _on_video_del(Elm_Player_Smart_Data *sd)
 
 static void
 _video_del(void *data,
-           Evas *e __UNUSED__,
-           Evas_Object *obj __UNUSED__,
-           void *event_info __UNUSED__)
+           Evas *e EINA_UNUSED,
+           Evas_Object *obj EINA_UNUSED,
+           void *event_info EINA_UNUSED)
 {
    _on_video_del(data);
 }

legacy/elementary/src/lib/elc_popup.c

@@ -70,16 +70,16 @@ _visuals_set(Evas_Object *obj)
 
 static void
 _block_clicked_cb(void *data,
-                  Evas_Object *obj __UNUSED__,
-                  void *event_info __UNUSED__)
+                  Evas_Object *obj EINA_UNUSED,
+                  void *event_info EINA_UNUSED)
 {
    evas_object_smart_callback_call(data, SIG_BLOCK_CLICKED, NULL);
 }
 
 static void
 _timeout_cb(void *data,
-            Evas_Object *obj __UNUSED__,
-            void *event_info __UNUSED__)
+            Evas_Object *obj EINA_UNUSED,
+            void *event_info EINA_UNUSED)
 {
    evas_object_hide(data);
    evas_object_smart_callback_call(data, SIG_TIMEOUT, NULL);
@@ -98,10 +98,10 @@ _access_object_get(const Evas_Object *obj, const char* part)
 }
 
 static void
-_on_show(void *data __UNUSED__,
-         Evas *e __UNUSED__,
+_on_show(void *data EINA_UNUSED,
+         Evas *e EINA_UNUSED,
          Evas_Object *obj,
-         void *event_info __UNUSED__)
+         void *event_info EINA_UNUSED)
 {
    ELM_POPUP_DATA_GET(obj, sd);
 
@@ -120,10 +120,10 @@ _on_show(void *data __UNUSED__,
 }
 
 static void
-_on_hide(void *data __UNUSED__,
-            Evas *e __UNUSED__,
+_on_hide(void *data EINA_UNUSED,
+            Evas *e EINA_UNUSED,
             Evas_Object *obj,
-            void *event_info __UNUSED__)
+            void *event_info EINA_UNUSED)
 {
    ELM_POPUP_DATA_GET(obj, sd);
 
@@ -173,9 +173,9 @@ _scroller_size_calc(Evas_Object *obj)
 
 static void
 _size_hints_changed_cb(void *data,
-                       Evas *e __UNUSED__,
-                       Evas_Object *obj __UNUSED__,
-                       void *event_info __UNUSED__)
+                       Evas *e EINA_UNUSED,
+                       Evas_Object *obj EINA_UNUSED,
+                       void *event_info EINA_UNUSED)
 {
    elm_layout_sizing_eval(data);
 }
@@ -481,9 +481,9 @@ _elm_popup_smart_sub_object_del(Eo *obj, void *_pd, va_list *list)
 
 static void
 _on_content_del(void *data,
-                Evas *e __UNUSED__,
-                Evas_Object *obj __UNUSED__,
-                void *event_info __UNUSED__)
+                Evas *e EINA_UNUSED,
+                Evas_Object *obj EINA_UNUSED,
+                void *event_info EINA_UNUSED)
 {
    ELM_POPUP_DATA_GET(data, sd);
 
@@ -493,9 +493,9 @@ _on_content_del(void *data,
 
 static void
 _on_text_content_del(void *data,
-                     Evas *e __UNUSED__,
-                     Evas_Object *obj __UNUSED__,
-                     void *event_info __UNUSED__)
+                     Evas *e EINA_UNUSED,
+                     Evas_Object *obj EINA_UNUSED,
+                     void *event_info EINA_UNUSED)
 {
    ELM_POPUP_DATA_GET(data, sd);
 
@@ -505,9 +505,9 @@ _on_text_content_del(void *data,
 
 static void
 _on_table_del(void *data,
-              Evas *e __UNUSED__,
-              Evas_Object *obj __UNUSED__,
-              void *event_info __UNUSED__)
+              Evas *e EINA_UNUSED,
+              Evas_Object *obj EINA_UNUSED,
+              void *event_info EINA_UNUSED)
 {
    ELM_POPUP_DATA_GET(data, sd);
 
@@ -520,9 +520,9 @@ _on_table_del(void *data,
 
 static void
 _on_button_del(void *data,
-               Evas *e __UNUSED__,
+               Evas *e EINA_UNUSED,
                Evas_Object *obj,
-               void *event_info __UNUSED__)
+               void *event_info EINA_UNUSED)
 {
    int i;
 
@@ -597,18 +597,18 @@ _button_remove(Evas_Object *obj,
 
 static void
 _layout_change_cb(void *data,
-                  Evas_Object *obj __UNUSED__,
-                  const char *emission __UNUSED__,
-                  const char *source __UNUSED__)
+                  Evas_Object *obj EINA_UNUSED,
+                  const char *emission EINA_UNUSED,
+                  const char *source EINA_UNUSED)
 {
    elm_layout_sizing_eval(data);
 }
 
 static void
-_restack_cb(void *data __UNUSED__,
-            Evas *e __UNUSED__,
+_restack_cb(void *data EINA_UNUSED,
+            Evas *e EINA_UNUSED,
             Evas_Object *obj,
-            void *event_info __UNUSED__)
+            void *event_info EINA_UNUSED)
 {
    ELM_POPUP_DATA_GET(obj, sd);
 
@@ -659,9 +659,9 @@ _list_add(Evas_Object *obj)
 
 static void
 _item_select_cb(void *data,
-                Evas_Object *obj __UNUSED__,
-                const char *emission __UNUSED__,
-                const char *source __UNUSED__)
+                Evas_Object *obj EINA_UNUSED,
+                const char *emission EINA_UNUSED,
+                const char *source EINA_UNUSED)
 {
    Elm_Popup_Item *it = data;
 

legacy/elementary/src/lib/elm_access.c

@@ -291,7 +291,7 @@ _access_obj_over_timeout_cb(void *data)
 }
 
 static void
-_access_hover_mouse_in_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info  __UNUSED__)
+_access_hover_mouse_in_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info  EINA_UNUSED)
 {
    Elm_Access_Info *ac;
    if (!mouse_event_enable) return;
@@ -306,7 +306,7 @@ _access_hover_mouse_in_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU
 }
 
 static void
-_access_hover_mouse_out_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+_access_hover_mouse_out_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Elm_Access_Info *ac;
    if (!mouse_event_enable) return;
@@ -320,14 +320,14 @@ _access_hover_mouse_out_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UN
 }
 
 static void
-_access_read_done(void *data __UNUSED__)
+_access_read_done(void *data EINA_UNUSED)
 {
    DBG("read done");
    // FIXME: produce event here
 }
 
 static void
-_access_2nd_click_del_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+_access_2nd_click_del_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    Ecore_Timer *t;
 
@@ -351,19 +351,19 @@ _access_2nd_click_timeout_cb(void *data)
 }
 
 static void
-_access_obj_hilight_del_cb(void *data __UNUSED__, Evas *e, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+_access_obj_hilight_del_cb(void *data EINA_UNUSED, Evas *e, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    _elm_access_object_highlight_disable(e);
 }
 
 static void
-_access_obj_hilight_hide_cb(void *data __UNUSED__, Evas *e, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+_access_obj_hilight_hide_cb(void *data EINA_UNUSED, Evas *e, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    _elm_access_object_highlight_disable(e);
 }
 
 static void
-_access_obj_hilight_move_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+_access_obj_hilight_move_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    Evas_Coord x, y;
    Evas_Object *o;
@@ -375,7 +375,7 @@ _access_obj_hilight_move_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Obje
 }
 
 static void
-_access_obj_hilight_resize_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+_access_obj_hilight_resize_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    Evas_Coord w, h;
    Evas_Object *o;
@@ -416,9 +416,9 @@ _elm_access_shutdown()
 
 static void
 _access_order_del_cb(void *data,
-                     Evas *e __UNUSED__,
+                     Evas *e EINA_UNUSED,
                      Evas_Object *obj,
-                     void *event_info __UNUSED__)
+                     void *event_info EINA_UNUSED)
 {
    Elm_Widget_Item *item = data;
 
@@ -854,8 +854,8 @@ _elm_access_object_unhilight(Evas_Object *obj)
 }
 
 static void
-_content_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj,
-                void *event_info __UNUSED__)
+_content_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
+                void *event_info EINA_UNUSED)
 {
    Evas_Object *accessobj;
    Evas_Coord w, h;
@@ -868,8 +868,8 @@ _content_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj,
 }
 
 static void
-_content_move(void *data, Evas *e __UNUSED__, Evas_Object *obj,
-              void *event_info __UNUSED__)
+_content_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
+              void *event_info EINA_UNUSED)
 {
    Evas_Object *accessobj;
    Evas_Coord x, y;
@@ -963,7 +963,7 @@ _elm_access_edje_object_part_object_register(Evas_Object* obj,
 
 //FIXME: unused obj should be removed from here and each widget.
 EAPI void
-_elm_access_edje_object_part_object_unregister(Evas_Object* obj __UNUSED__,
+_elm_access_edje_object_part_object_unregister(Evas_Object* obj EINA_UNUSED,
                                                const Evas_Object *eobj,
                                                const char* part)
 {
@@ -999,7 +999,7 @@ _elm_access_object_highlight_disable(Evas *e)
 }
 
 static void
-_access_obj_del_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+_access_obj_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
 
    Ecore_Job *ao_del_job = NULL;
@@ -1037,7 +1037,7 @@ _access_obj_del_job(void *data)
 }
 
 static void
-_access_hover_del_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+_access_hover_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    Ecore_Job *ao_del_job = NULL;
 

legacy/elementary/src/lib/elm_actionslider.c

@@ -129,9 +129,9 @@ _elm_actionslider_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 
 static void
 _drag_button_down_cb(void *data,
-                     Evas_Object *o __UNUSED__,
-                     const char *emission __UNUSED__,
-                     const char *source __UNUSED__)
+                     Evas_Object *o EINA_UNUSED,
+                     const char *emission EINA_UNUSED,
+                     const char *source EINA_UNUSED)
 {
    Elm_Actionslider_Smart_Data *sd = eo_data_scope_get(data, MY_CLASS);
 
@@ -140,9 +140,9 @@ _drag_button_down_cb(void *data,
 
 static void
 _drag_button_move_cb(void *data,
-                     Evas_Object *o __UNUSED__,
-                     const char *emission __UNUSED__,
-                     const char *source __UNUSED__)
+                     Evas_Object *o EINA_UNUSED,
+                     const char *emission EINA_UNUSED,
+                     const char *source EINA_UNUSED)
 {
    Evas_Object *obj = data;
    double pos = 0.0;
@@ -249,9 +249,9 @@ _button_animator(void *data)
 
 static void
 _drag_button_up_cb(void *data,
-                   Evas_Object *o __UNUSED__,
-                   const char *emission __UNUSED__,
-                   const char *source __UNUSED__)
+                   Evas_Object *o EINA_UNUSED,
+                   const char *emission EINA_UNUSED,
+                   const char *source EINA_UNUSED)
 {
    Evas_Object *obj = data;
    double position = 0.0;

legacy/elementary/src/lib/elm_bg.c

@@ -94,9 +94,9 @@ _elm_bg_smart_sizing_eval(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 
 static void
 _on_resize(void *data,
-           Evas *e __UNUSED__,
-           Evas_Object *obj __UNUSED__,
-           void *event_info __UNUSED__)
+           Evas *e EINA_UNUSED,
+           Evas_Object *obj EINA_UNUSED,
+           void *event_info EINA_UNUSED)
 {
    elm_layout_sizing_eval(data);
 }
@@ -143,8 +143,8 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
 
 static void
 _elm_bg_file_reload(void *data, Evas_Object *obj,
-                    const char *emission __UNUSED__,
-                    const char *source __UNUSED__)
+                    const char *emission EINA_UNUSED,
+                    const char *source EINA_UNUSED)
 {
    Evas_Object *bg = data;
    const char *file;

legacy/elementary/src/lib/elm_box.c

@@ -30,7 +30,7 @@ _elm_box_list_data_get(const Eina_List *list)
 
 static void
 _child_added_cb_proxy(void *data,
-                      Evas_Object *o __UNUSED__,
+                      Evas_Object *o EINA_UNUSED,
                       void *event_info)
 {
    Evas_Object *box = data;
@@ -40,7 +40,7 @@ _child_added_cb_proxy(void *data,
 
 static void
 _child_removed_cb_proxy(void *data,
-                        Evas_Object *o __UNUSED__,
+                        Evas_Object *o EINA_UNUSED,
                         void *event_info)
 {
    Evas_Object *box = data;
@@ -173,9 +173,9 @@ _sizing_eval(Evas_Object *obj)
 
 static void
 _on_size_hints_changed(void *data,
-                       Evas *e __UNUSED__,
-                       Evas_Object *obj __UNUSED__,
-                       void *event_info __UNUSED__)
+                       Evas *e EINA_UNUSED,
+                       Evas_Object *obj EINA_UNUSED,
+                       void *event_info EINA_UNUSED)
 {
    _sizing_eval(data);
 }
@@ -217,7 +217,7 @@ _transition_animation(void *data)
 
 static void
 _transition_layout_child_added(void *data,
-                               Evas_Object *obj __UNUSED__,
+                               Evas_Object *obj EINA_UNUSED,
                                void *event_info)
 {
    Transition_Animation_Data *tad;
@@ -234,7 +234,7 @@ _transition_layout_child_added(void *data,
 
 static void
 _transition_layout_child_removed(void *data,
-                                 Evas_Object *obj __UNUSED__,
+                                 Evas_Object *obj EINA_UNUSED,
                                  void *event_info)
 {
    Eina_List *l;
@@ -255,9 +255,9 @@ _transition_layout_child_removed(void *data,
 
 static void
 _transition_layout_obj_resize_cb(void *data,
-                                 Evas *e __UNUSED__,
-                                 Evas_Object *obj __UNUSED__,
-                                 void *event_info __UNUSED__)
+                                 Evas *e EINA_UNUSED,
+                                 Evas_Object *obj EINA_UNUSED,
+                                 void *event_info EINA_UNUSED)
 {
    Elm_Box_Transition *layout_data = data;
 
@@ -368,7 +368,7 @@ _transition_layout_animation_stop(Elm_Box_Transition *layout_data)
 
 static void
 _transition_layout_animation_exec(Evas_Object *obj,
-                                  Evas_Object_Box_Data *priv __UNUSED__,
+                                  Evas_Object_Box_Data *priv EINA_UNUSED,
                                   Elm_Box_Transition *layout_data,
                                   const double curtime)
 {

legacy/elementary/src/lib/elm_bubble.c

@@ -61,8 +61,8 @@ _elm_bubble_smart_sizing_eval(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA
 
 static void
 _on_mouse_up(void *data,
-             Evas *e __UNUSED__,
-             Evas_Object *obj __UNUSED__,
+             Evas *e EINA_UNUSED,
+             Evas_Object *obj EINA_UNUSED,
              void *event_info)
 {
    Evas_Event_Mouse_Up *ev = event_info;
@@ -155,7 +155,7 @@ _elm_bubble_smart_text_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 }
 
 static char *
-_access_info_cb(void *data __UNUSED__, Evas_Object *obj)
+_access_info_cb(void *data EINA_UNUSED, Evas_Object *obj)
 {
    char *ret;
    Eina_Strbuf *buf;

legacy/elementary/src/lib/elm_button.c

@@ -193,9 +193,9 @@ _elm_button_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 
 static void
 _on_clicked_signal(void *data,
-                   Evas_Object *obj __UNUSED__,
-                   const char *emission __UNUSED__,
-                   const char *source __UNUSED__)
+                   Evas_Object *obj EINA_UNUSED,
+                   const char *emission EINA_UNUSED,
+                   const char *source EINA_UNUSED)
 {
    _activate(data);
 }
@@ -230,9 +230,9 @@ _autorepeat_initial_send(void *data)
 
 static void
 _on_pressed_signal(void *data,
-                   Evas_Object *obj __UNUSED__,
-                   const char *emission __UNUSED__,
-                   const char *source __UNUSED__)
+                   Evas_Object *obj EINA_UNUSED,
+                   const char *emission EINA_UNUSED,
+                   const char *source EINA_UNUSED)
 {
    ELM_BUTTON_DATA_GET_OR_RETURN(data, sd);
 
@@ -250,9 +250,9 @@ _on_pressed_signal(void *data,
 
 static void
 _on_unpressed_signal(void *data,
-                     Evas_Object *obj __UNUSED__,
-                     const char *emission __UNUSED__,
-                     const char *source __UNUSED__)
+                     Evas_Object *obj EINA_UNUSED,
+                     const char *emission EINA_UNUSED,
+                     const char *source EINA_UNUSED)
 {
    ELM_BUTTON_DATA_GET_OR_RETURN(data, sd);
 
@@ -262,7 +262,7 @@ _on_unpressed_signal(void *data,
 }
 
 static char *
-_access_info_cb(void *data __UNUSED__, Evas_Object *obj)
+_access_info_cb(void *data EINA_UNUSED, Evas_Object *obj)
 {
    const char *txt = elm_widget_access_info_get(obj);
 
@@ -273,7 +273,7 @@ _access_info_cb(void *data __UNUSED__, Evas_Object *obj)
 }
 
 static char *
-_access_state_cb(void *data __UNUSED__, Evas_Object *obj)
+_access_state_cb(void *data EINA_UNUSED, Evas_Object *obj)
 {
    if (elm_widget_disabled_get(obj))
      return strdup(E_("State: Disabled"));

legacy/elementary/src/lib/elm_calendar.c

@@ -237,7 +237,7 @@ _set_month_year(Elm_Calendar_Smart_Data *sd)
 }
 
 static char *
-_access_info_cb(void *data __UNUSED__, Evas_Object *obj)
+_access_info_cb(void *data EINA_UNUSED, Evas_Object *obj)
 {
    char *ret;
    Eina_Strbuf *buf;
@@ -667,9 +667,9 @@ _spin_year_value(void *data)
 
 static void
 _button_month_inc_start(void *data,
-                  Evas_Object *obj __UNUSED__,
-                  const char *emission __UNUSED__,
-                  const char *source __UNUSED__)
+                  Evas_Object *obj EINA_UNUSED,
+                  const char *emission EINA_UNUSED,
+                  const char *source EINA_UNUSED)
 {
    ELM_CALENDAR_DATA_GET(data, sd);
 
@@ -683,9 +683,9 @@ _button_month_inc_start(void *data,
 
 static void
 _button_month_dec_start(void *data,
-                  Evas_Object *obj __UNUSED__,
-                  const char *emission __UNUSED__,
-                  const char *source __UNUSED__)
+                  Evas_Object *obj EINA_UNUSED,
+                  const char *emission EINA_UNUSED,
+                  const char *source EINA_UNUSED)
 {
    ELM_CALENDAR_DATA_GET(data, sd);
 
@@ -699,9 +699,9 @@ _button_month_dec_start(void *data,
 
 static void
 _button_month_stop(void *data,
-                   Evas_Object *obj __UNUSED__,
-                   const char *emission __UNUSED__,
-                   const char *source __UNUSED__)
+                   Evas_Object *obj EINA_UNUSED,
+                   const char *emission EINA_UNUSED,
+                   const char *source EINA_UNUSED)
 {
    ELM_CALENDAR_DATA_GET(data, sd);
 
@@ -711,9 +711,9 @@ _button_month_stop(void *data,
 
 static void
 _button_year_inc_start(void *data,
-                       Evas_Object *obj __UNUSED__,
-                       const char *emission __UNUSED__,
-                       const char *source __UNUSED__)
+                       Evas_Object *obj EINA_UNUSED,
+                       const char *emission EINA_UNUSED,
+                       const char *source EINA_UNUSED)
 {
    ELM_CALENDAR_DATA_GET(data, sd);
 
@@ -727,9 +727,9 @@ _button_year_inc_start(void *data,
 
 static void
 _button_year_dec_start(void *data,
-                  Evas_Object *obj __UNUSED__,
-                  const char *emission __UNUSED__,
-                  const char *source __UNUSED__)
+                  Evas_Object *obj EINA_UNUSED,
+                  const char *emission EINA_UNUSED,
+                  const char *source EINA_UNUSED)
 {
    ELM_CALENDAR_DATA_GET(data, sd);
 
@@ -743,9 +743,9 @@ _button_year_dec_start(void *data,
 
 static void
 _button_year_stop(void *data,
-                  Evas_Object *obj __UNUSED__,
-                  const char *emission __UNUSED__,
-                  const char *source __UNUSED__)
+                  Evas_Object *obj EINA_UNUSED,
+                  const char *emission EINA_UNUSED,
+                  const char *source EINA_UNUSED)
 {
    ELM_CALENDAR_DATA_GET(data, sd);
 
@@ -795,8 +795,8 @@ _update_sel_it(Evas_Object *obj,
 
 static void
 _day_selected(void *data,
-              Evas_Object *obj __UNUSED__,
-              const char *emission __UNUSED__,
+              Evas_Object *obj EINA_UNUSED,
+              const char *emission EINA_UNUSED,
               const char *source)
 {
    int sel_it;
@@ -922,9 +922,9 @@ _elm_calendar_smart_calculate(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA
 
 static void
 _style_changed(void *data,
-               Evas_Object *obj __UNUSED__,
-               const char *emission __UNUSED__,
-               const char *source __UNUSED__)
+               Evas_Object *obj EINA_UNUSED,
+               const char *emission EINA_UNUSED,
+               const char *source EINA_UNUSED)
 {
    ELM_CALENDAR_DATA_GET(data, sd);
 

legacy/elementary/src/lib/elm_check.c

@@ -202,7 +202,7 @@ _elm_check_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 }
 
 static char *
-_access_info_cb(void *data __UNUSED__, Evas_Object *obj)
+_access_info_cb(void *data EINA_UNUSED, Evas_Object *obj)
 {
    const char *txt = elm_widget_access_info_get(obj);
 
@@ -249,9 +249,9 @@ _access_state_cb(void *data, Evas_Object *obj)
 
 static void
 _on_check_off(void *data,
-              Evas_Object *o __UNUSED__,
-              const char *emission __UNUSED__,
-              const char *source __UNUSED__)
+              Evas_Object *o EINA_UNUSED,
+              const char *emission EINA_UNUSED,
+              const char *source EINA_UNUSED)
 {
    Evas_Object *obj = data;
 
@@ -266,9 +266,9 @@ _on_check_off(void *data,
 
 static void
 _on_check_on(void *data,
-             Evas_Object *o __UNUSED__,
-             const char *emission __UNUSED__,
-             const char *source __UNUSED__)
+             Evas_Object *o EINA_UNUSED,
+             const char *emission EINA_UNUSED,
+             const char *source EINA_UNUSED)
 {
    Evas_Object *obj = data;
 
@@ -282,9 +282,9 @@ _on_check_on(void *data,
 
 static void
 _on_check_toggle(void *data,
-                 Evas_Object *o __UNUSED__,
-                 const char *emission __UNUSED__,
-                 const char *source __UNUSED__)
+                 Evas_Object *o EINA_UNUSED,
+                 const char *emission EINA_UNUSED,
+                 const char *source EINA_UNUSED)
 {
    _activate(data);
 }

legacy/elementary/src/lib/elm_clock.c

@@ -138,8 +138,8 @@ clock_val_down_cancel:
 static void
 _on_clock_val_up_start(void *data,
                        Evas_Object *obj,
-                       const char *emission __UNUSED__,
-                       const char *source __UNUSED__)
+                       const char *emission EINA_UNUSED,
+                       const char *source EINA_UNUSED)
 {
    ELM_CLOCK_DATA_GET(data, sd);
 
@@ -154,8 +154,8 @@ _on_clock_val_up_start(void *data,
 static void
 _on_clock_val_down_start(void *data,
                          Evas_Object *obj,
-                         const char *emission __UNUSED__,
-                         const char *source __UNUSED__)
+                         const char *emission EINA_UNUSED,
+                         const char *source EINA_UNUSED)
 {
    ELM_CLOCK_DATA_GET(data, sd);
 
@@ -169,9 +169,9 @@ _on_clock_val_down_start(void *data,
 
 static void
 _on_clock_val_change_stop(void *data,
-                          Evas_Object *obj __UNUSED__,
-                          const char *emission __UNUSED__,
-                          const char *source __UNUSED__)
+                          Evas_Object *obj EINA_UNUSED,
+                          const char *emission EINA_UNUSED,
+                          const char *source EINA_UNUSED)
 {
    ELM_CLOCK_DATA_GET(data, sd);
 
@@ -182,7 +182,7 @@ _on_clock_val_change_stop(void *data,
 static void
 _access_activate_cb(void *data,
                     Evas_Object *part_obj,
-                    Elm_Object_Item *item __UNUSED__)
+                    Elm_Object_Item *item EINA_UNUSED)
 {
    Evas_Object *digit, *inc_btn;
    ELM_CLOCK_DATA_GET(data, sd);
@@ -617,7 +617,7 @@ _ticker(void *data)
 }
 
 static char *
-_access_info_cb(void *data __UNUSED__, Evas_Object *obj)
+_access_info_cb(void *data EINA_UNUSED, Evas_Object *obj)
 {
    int hrs;
    char *ret;
@@ -652,7 +652,7 @@ _access_info_cb(void *data __UNUSED__, Evas_Object *obj)
 }
 
 static char *
-_access_state_cb(void *data __UNUSED__, Evas_Object *obj)
+_access_state_cb(void *data EINA_UNUSED, Evas_Object *obj)
 {
    ELM_CLOCK_DATA_GET(obj, sd);
    if (sd->edit)

legacy/elementary/src/lib/elm_cnp.c

@@ -181,7 +181,7 @@ static void _cont_obj_mouse_move( void *data, Evas *e, Evas_Object *obj, void *e
 static void _all_drop_targets_cbs_del(void *data, Evas *e, Evas_Object *obj, void *info);
 
 static Eina_Bool
-_drag_cancel_animate(void *data __UNUSED__, double pos)
+_drag_cancel_animate(void *data EINA_UNUSED, double pos)
 {  /* Animation to "move back" drag-window */
    if (pos >= 0.99)
      {
@@ -200,7 +200,7 @@ _drag_cancel_animate(void *data __UNUSED__, double pos)
 }
 
 static void
-_all_drop_targets_cbs_del(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *info __UNUSED__)
+_all_drop_targets_cbs_del(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *info EINA_UNUSED)
 {
    Dropable *dropable = NULL;
    eo_do(obj, eo_base_data_get("__elm_dropable", (void **)&dropable));
@@ -270,16 +270,16 @@ struct _X11_Cnp_Atom
    Ecore_X_Atom             atom;
 };
 
-static void           _x11_sel_obj_del              (void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__);
-static void           _x11_sel_obj_del2             (void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__);
-static Eina_Bool      _x11_selection_clear          (void *udata __UNUSED__, int type, void *event);
-static Eina_Bool      _x11_selection_notify         (void *udata __UNUSED__, int type, void *event);
+static void           _x11_sel_obj_del              (void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED);
+static void           _x11_sel_obj_del2             (void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED);
+static Eina_Bool      _x11_selection_clear          (void *udata EINA_UNUSED, int type, void *event);
+static Eina_Bool      _x11_selection_notify         (void *udata EINA_UNUSED, int type, void *event);
 static Eina_Bool      _x11_targets_converter        (char *target, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype, int *typesize);
 static Eina_Bool      _x11_text_converter           (char *target, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype, int *typesize);
 static Eina_Bool      _x11_general_converter        (char *target, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype, int *typesize);
 static Eina_Bool      _x11_image_converter          (char *target, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype, int *typesize);
 static Eina_Bool      _x11_vcard_send               (char *target, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype, int *typesize);
-static Eina_Bool      _x11_is_uri_type_data         (X11_Cnp_Selection *sel __UNUSED__, Ecore_X_Event_Selection_Notify *notify);
+static Eina_Bool      _x11_is_uri_type_data         (X11_Cnp_Selection *sel EINA_UNUSED, Ecore_X_Event_Selection_Notify *notify);
 static int            _x11_response_handler_targets (X11_Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *);
 static int            _x11_notify_handler_targets   (X11_Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify);
 static int            _x11_notify_handler_text      (X11_Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify);
@@ -287,19 +287,19 @@ static int            _x11_notify_handler_image     (X11_Cnp_Selection *sel, Eco
 static int            _x11_notify_handler_uri       (X11_Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify);
 //static int            _x11_notify_handler_html      (X11_Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify);
 static int            _x11_vcard_receive            (X11_Cnp_Selection *sed, Ecore_X_Event_Selection_Notify *notify);
-static Eina_Bool      _x11_dnd_enter                (void *data __UNUSED__, int etype __UNUSED__, void *ev);
-static Eina_Bool      _x11_dnd_drop                 (void *data __UNUSED__, int etype __UNUSED__, void *ev);
-static Eina_Bool      _x11_dnd_position             (void *data __UNUSED__, int etype __UNUSED__, void *ev);
-static Eina_Bool      _x11_dnd_status               (void *data __UNUSED__, int etype __UNUSED__, void *ev);
-static Eina_Bool      _x11_dnd_leave                (void *data __UNUSED__, int etype __UNUSED__, void *ev);
-static Eina_Bool      _x11_drag_mouse_up            (void *data, int etype __UNUSED__, void *event);
-static void           _x11_drag_move                (void *data __UNUSED__, Ecore_X_Xdnd_Position *pos);
+static Eina_Bool      _x11_dnd_enter                (void *data EINA_UNUSED, int etype EINA_UNUSED, void *ev);
+static Eina_Bool      _x11_dnd_drop                 (void *data EINA_UNUSED, int etype EINA_UNUSED, void *ev);
+static Eina_Bool      _x11_dnd_position             (void *data EINA_UNUSED, int etype EINA_UNUSED, void *ev);
+static Eina_Bool      _x11_dnd_status               (void *data EINA_UNUSED, int etype EINA_UNUSED, void *ev);
+static Eina_Bool      _x11_dnd_leave                (void *data EINA_UNUSED, int etype EINA_UNUSED, void *ev);
+static Eina_Bool      _x11_drag_mouse_up            (void *data, int etype EINA_UNUSED, void *event);
+static void           _x11_drag_move                (void *data EINA_UNUSED, Ecore_X_Xdnd_Position *pos);
 
 static Ecore_X_Window _x11_elm_widget_xwin_get           (const Evas_Object *obj);
 
 static Eina_Bool _x11_elm_cnp_init                       (void);
 static Eina_Bool _x11_elm_cnp_selection_set              (Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Format format, const void *selbuf, size_t buflen);
-static void      _x11_elm_cnp_selection_loss_callback_set(Evas_Object *obj __UNUSED__, Elm_Sel_Type selection, Elm_Selection_Loss_Cb func, const void *data);
+static void      _x11_elm_cnp_selection_loss_callback_set(Evas_Object *obj EINA_UNUSED, Elm_Sel_Type selection, Elm_Selection_Loss_Cb func, const void *data);
 static Eina_Bool _x11_elm_object_cnp_selection_clear     (Evas_Object *obj, Elm_Sel_Type selection);
 static Eina_Bool _x11_elm_cnp_selection_get              (Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Format format, Elm_Drop_Cb datacb, void *udata);
 static Eina_Bool _x11_elm_drop_target_add                (Evas_Object *obj, Elm_Sel_Format format,
@@ -312,7 +312,7 @@ static Eina_Bool _x11_elm_drop_target_del                (Evas_Object *obj, Elm_
                                                           Elm_Drag_State leavecb, void *leavedata,
                                                           Elm_Drag_Pos poscb, void *posdata,
                                                           Elm_Drop_Cb dropcb, void *dropdata);
-static Eina_Bool _x11_elm_selection_selection_has_owner  (Evas_Object *obj __UNUSED__);
+static Eina_Bool _x11_elm_selection_selection_has_owner  (Evas_Object *obj EINA_UNUSED);
 
 static X11_Cnp_Atom _x11_atoms[CNP_N_ATOMS] = {
    [CNP_ATOM_TARGETS] = {
@@ -531,7 +531,7 @@ static X11_Cnp_Selection _x11_selections[ELM_SEL_TYPE_CLIPBOARD + 1] = {
 };
 
 static void
-_x11_sel_obj_del(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+_x11_sel_obj_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    X11_Cnp_Selection *sel = data;
    if (sel->widget == obj) sel->widget = NULL;
@@ -539,14 +539,14 @@ _x11_sel_obj_del(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_i
 }
 
 static void
-_x11_sel_obj_del2(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+_x11_sel_obj_del2(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    X11_Cnp_Selection *sel = data;
    if (sel->requestwidget == obj) sel->requestwidget = NULL;
 }
 
 static Eina_Bool
-_x11_selection_clear(void *udata __UNUSED__, int type __UNUSED__, void *event)
+_x11_selection_clear(void *udata EINA_UNUSED, int type EINA_UNUSED, void *event)
 {
    Ecore_X_Event_Selection_Clear *ev = event;
    X11_Cnp_Selection *sel;
@@ -585,7 +585,7 @@ _x11_selection_clear(void *udata __UNUSED__, int type __UNUSED__, void *event)
  *    else it's the data we want.
  */
 static Eina_Bool
-_x11_selection_notify(void *udata __UNUSED__, int type __UNUSED__, void *event)
+_x11_selection_notify(void *udata EINA_UNUSED, int type EINA_UNUSED, void *event)
 {
    Ecore_X_Event_Selection_Notify *ev = event;
    X11_Cnp_Selection *sel;
@@ -644,7 +644,7 @@ _get_selection_type(void *data, int size)
 }
 
 static Eina_Bool
-_x11_targets_converter(char *target __UNUSED__, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype, int *typesize)
+_x11_targets_converter(char *target EINA_UNUSED, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype, int *typesize)
 {
    int i, count;
    Ecore_X_Atom *aret;
@@ -683,14 +683,14 @@ _x11_targets_converter(char *target __UNUSED__, void *data, int size, void **dat
 }
 
 static Eina_Bool
-_x11_image_converter(char *target __UNUSED__, void *data __UNUSED__, int size __UNUSED__, void **data_ret __UNUSED__, int *size_ret __UNUSED__, Ecore_X_Atom *ttype __UNUSED__, int *typesize __UNUSED__)
+_x11_image_converter(char *target EINA_UNUSED, void *data EINA_UNUSED, int size EINA_UNUSED, void **data_ret EINA_UNUSED, int *size_ret EINA_UNUSED, Ecore_X_Atom *ttype EINA_UNUSED, int *typesize EINA_UNUSED)
 {
    cnp_debug("Image converter called\n");
    return EINA_TRUE;
 }
 
 static Eina_Bool
-_x11_vcard_send(char *target __UNUSED__, void *data __UNUSED__, int size __UNUSED__, void **data_ret, int *size_ret, Ecore_X_Atom *ttype __UNUSED__, int *typesize __UNUSED__)
+_x11_vcard_send(char *target EINA_UNUSED, void *data EINA_UNUSED, int size EINA_UNUSED, void **data_ret, int *size_ret, Ecore_X_Atom *ttype EINA_UNUSED, int *typesize EINA_UNUSED)
 {
    X11_Cnp_Selection *sel;
 
@@ -702,7 +702,7 @@ _x11_vcard_send(char *target __UNUSED__, void *data __UNUSED__, int size __UNUSE
 }
 
 static Eina_Bool
-_x11_is_uri_type_data(X11_Cnp_Selection *sel __UNUSED__, Ecore_X_Event_Selection_Notify *notify)
+_x11_is_uri_type_data(X11_Cnp_Selection *sel EINA_UNUSED, Ecore_X_Event_Selection_Notify *notify)
 {
    Ecore_X_Selection_Data *data;
    char *p;
@@ -1127,7 +1127,7 @@ _x11_text_converter(char *target, void *data, int size, void **data_ret, int *si
 }
 
 static Eina_Bool
-_x11_general_converter(char *target __UNUSED__, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype __UNUSED__, int *typesize __UNUSED__)
+_x11_general_converter(char *target EINA_UNUSED, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype EINA_UNUSED, int *typesize EINA_UNUSED)
 {
    if (_get_selection_type(data, size) == ELM_SEL_FORMAT_NONE)
      {
@@ -1251,7 +1251,7 @@ _x11_dropable_all_set(Ecore_X_Window win, Evas_Coord x, Evas_Coord y, Eina_Bool
 }
 
 static Eina_Bool
-_x11_dnd_enter(void *data __UNUSED__, int etype __UNUSED__, void *ev)
+_x11_dnd_enter(void *data EINA_UNUSED, int etype EINA_UNUSED, void *ev)
 {
    Ecore_X_Event_Xdnd_Enter *enter = ev;
    int i;
@@ -1391,7 +1391,7 @@ _x11_dnd_action_rev_map(Elm_Xdnd_Action action)
 }
 
 static Eina_Bool
-_x11_dnd_position(void *data __UNUSED__, int etype __UNUSED__, void *ev)
+_x11_dnd_position(void *data EINA_UNUSED, int etype EINA_UNUSED, void *ev)
 {
    Ecore_X_Event_Xdnd_Position *pos = ev;
    Ecore_X_Rectangle rect = { 0, 0, 0, 0 };
@@ -1444,7 +1444,7 @@ _x11_dnd_position(void *data __UNUSED__, int etype __UNUSED__, void *ev)
 }
 
 static Eina_Bool
-_x11_dnd_leave(void *data __UNUSED__, int etype __UNUSED__, void *ev)
+_x11_dnd_leave(void *data EINA_UNUSED, int etype EINA_UNUSED, void *ev)
 {
    Ecore_X_Event_Xdnd_Leave *leave = ev;
    Dropable *dropable;
@@ -1462,7 +1462,7 @@ _x11_dnd_leave(void *data __UNUSED__, int etype __UNUSED__, void *ev)
 }
 
 static Eina_Bool
-_x11_dnd_drop(void *data __UNUSED__, int etype __UNUSED__, void *ev)
+_x11_dnd_drop(void *data EINA_UNUSED, int etype EINA_UNUSED, void *ev)
 {
    Ecore_X_Event_Xdnd_Drop *drop;
    Dropable *dropable;
@@ -1582,7 +1582,7 @@ found:
 }
 
 static Eina_Bool
-_x11_dnd_status(void *data __UNUSED__, int etype __UNUSED__, void *ev)
+_x11_dnd_status(void *data EINA_UNUSED, int etype EINA_UNUSED, void *ev)
 {
    Ecore_X_Event_Xdnd_Status *status = ev;
    doaccept = EINA_FALSE;
@@ -1605,7 +1605,7 @@ _x11_dnd_status(void *data __UNUSED__, int etype __UNUSED__, void *ev)
 }
 
 static Eina_Bool
-_x11_drag_mouse_up(void *data, int etype __UNUSED__, void *event)
+_x11_drag_mouse_up(void *data, int etype EINA_UNUSED, void *event)
 {
    Ecore_X_Window xwin = (Ecore_X_Window)(long)data;
    Ecore_Event_Mouse_Button *ev = event;
@@ -1667,7 +1667,7 @@ _x11_drag_mouse_up(void *data, int etype __UNUSED__, void *event)
 }
 
 static void
-_x11_drag_move(void *data __UNUSED__, Ecore_X_Xdnd_Position *pos)
+_x11_drag_move(void *data EINA_UNUSED, Ecore_X_Xdnd_Position *pos)
 {
    evas_object_move(dragwin,
                     pos->position.x - _dragx, pos->position.y - _dragy);
@@ -1775,7 +1775,7 @@ _x11_elm_cnp_selection_set(Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_For
 }
 
 static void
-_x11_elm_cnp_selection_loss_callback_set(Evas_Object *obj __UNUSED__, Elm_Sel_Type selection, Elm_Selection_Loss_Cb func, const void *data)
+_x11_elm_cnp_selection_loss_callback_set(Evas_Object *obj EINA_UNUSED, Elm_Sel_Type selection, Elm_Selection_Loss_Cb func, const void *data)
 {
    X11_Cnp_Selection *sel;
 
@@ -1998,7 +1998,7 @@ _x11_elm_drop_target_del(Evas_Object *obj, Elm_Sel_Format format,
 }
 
 static void
-_x11_drag_target_del(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *info __UNUSED__)
+_x11_drag_target_del(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *info EINA_UNUSED)
 {
    X11_Cnp_Selection *sel = _x11_selections + ELM_SEL_TYPE_XDND;
 
@@ -2134,7 +2134,7 @@ _x11_elm_drag_action_set(Evas_Object *obj, Elm_Xdnd_Action action)
 }
 
 static Eina_Bool
-_x11_elm_selection_selection_has_owner(Evas_Object *obj __UNUSED__)
+_x11_elm_selection_selection_has_owner(Evas_Object *obj EINA_UNUSED)
 {
    _x11_elm_cnp_init();
    return !!ecore_x_selection_owner_get(ECORE_X_ATOM_SELECTION_CLIPBOARD);
@@ -2177,13 +2177,13 @@ static Wl_Cnp_Selection wl_cnp_selection =
    0, NULL, 0, EINA_FALSE
 };
 
-static void _wl_sel_obj_del2(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__);
-static Eina_Bool _wl_elm_cnp_selection_set(Evas_Object *obj __UNUSED__, Elm_Sel_Type selection, Elm_Sel_Format format __UNUSED__, const void *selbuf, size_t buflen);
-static Eina_Bool _wl_elm_cnp_selection_get(Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Format format __UNUSED__, Elm_Drop_Cb datacb __UNUSED__, void *udata __UNUSED__);
+static void _wl_sel_obj_del2(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED);
+static Eina_Bool _wl_elm_cnp_selection_set(Evas_Object *obj EINA_UNUSED, Elm_Sel_Type selection, Elm_Sel_Format format EINA_UNUSED, const void *selbuf, size_t buflen);
+static Eina_Bool _wl_elm_cnp_selection_get(Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Format format EINA_UNUSED, Elm_Drop_Cb datacb EINA_UNUSED, void *udata EINA_UNUSED);
 static Eina_Bool _wl_elm_cnp_selection_clear(Evas_Object *obj, Elm_Sel_Type selection);
 
-static Eina_Bool _wl_selection_send(void *udata, int type __UNUSED__, void *event);
-static Eina_Bool _wl_selection_receive(void *udata, int type __UNUSED__, void *event);
+static Eina_Bool _wl_selection_send(void *udata, int type EINA_UNUSED, void *event);
+static Eina_Bool _wl_selection_receive(void *udata, int type EINA_UNUSED, void *event);
 
 static Eina_Bool _wl_elm_dnd_init(void);
 static Eina_Bool _wl_elm_drop_target_add(Evas_Object *obj, Elm_Sel_Format format, Elm_Drag_State entercb, void *enterdata, Elm_Drag_State leavecb, void *leavedata, Elm_Drag_Pos poscb, void *posdata, Elm_Drop_Cb dropcb, void *dropdata);
@@ -2213,7 +2213,7 @@ static Eina_Bool _wl_drops_accept(const char *type);
 static unsigned int _wl_elm_widget_window_get(Evas_Object *obj);
 
 static void
-_wl_sel_obj_del(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+_wl_sel_obj_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    Wl_Cnp_Selection *sel = data;
    if (sel->widget == obj) sel->widget = NULL;
@@ -2221,7 +2221,7 @@ _wl_sel_obj_del(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_in
 }
 
 static void
-_wl_sel_obj_del2(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+_wl_sel_obj_del2(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    Wl_Cnp_Selection *sel = data;
    if (sel->requestwidget == obj) sel->requestwidget = NULL;
@@ -2369,7 +2369,7 @@ _wl_elm_cnp_selection_get(Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Form
 }
 
 static void
-_wl_elm_cnp_selection_loss_callback_set(Evas_Object *obj __UNUSED__, Elm_Sel_Type selection __UNUSED__, Elm_Selection_Loss_Cb func, const void *data)
+_wl_elm_cnp_selection_loss_callback_set(Evas_Object *obj EINA_UNUSED, Elm_Sel_Type selection EINA_UNUSED, Elm_Selection_Loss_Cb func, const void *data)
 {
    Wl_Cnp_Selection *sel = &wl_cnp_selection;
 
@@ -2380,7 +2380,7 @@ _wl_elm_cnp_selection_loss_callback_set(Evas_Object *obj __UNUSED__, Elm_Sel_Typ
 }
 
 static Eina_Bool
-_wl_elm_cnp_selection_clear(Evas_Object *obj, Elm_Sel_Type selection __UNUSED__)
+_wl_elm_cnp_selection_clear(Evas_Object *obj, Elm_Sel_Type selection EINA_UNUSED)
 {
    Wl_Cnp_Selection *sel = &wl_cnp_selection;
 
@@ -2413,7 +2413,7 @@ _wl_elm_cnp_selection_clear(Evas_Object *obj, Elm_Sel_Type selection __UNUSED__)
 }
 
 static Eina_Bool
-_wl_selection_send(void *udata, int type __UNUSED__, void *event)
+_wl_selection_send(void *udata, int type EINA_UNUSED, void *event)
 {
    char *buf;
    int ret, len_remained;
@@ -2440,7 +2440,7 @@ _wl_selection_send(void *udata, int type __UNUSED__, void *event)
 }
 
 static Eina_Bool
-_wl_selection_receive(void *udata, int type __UNUSED__, void *event)
+_wl_selection_receive(void *udata, int type EINA_UNUSED, void *event)
 {
    Wl_Cnp_Selection *sel = udata;
    Ecore_Wl_Event_Selection_Data_Ready *ev = event;
@@ -3314,29 +3314,29 @@ static Local_Selinfo _local_selinfo[4];
 static void       _local_get_job(void *data);
 
 static Eina_Bool  _local_elm_cnp_init(void);
-static Eina_Bool  _local_elm_cnp_selection_set(Evas_Object *obj __UNUSED__, Elm_Sel_Type selection, Elm_Sel_Format format, const void *selbuf, size_t buflen);
-static void       _local_elm_cnp_selection_loss_callback_set(Evas_Object *obj __UNUSED__, Elm_Sel_Type selection __UNUSED__, Elm_Selection_Loss_Cb func __UNUSED__, const void *data __UNUSED__);
-static Eina_Bool  _local_elm_object_cnp_selection_clear(Evas_Object *obj __UNUSED__, Elm_Sel_Type selection);
-static Eina_Bool  _local_elm_cnp_selection_get(Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Format format __UNUSED__, Elm_Drop_Cb datacb, void *udata);
-static  Eina_Bool _local_elm_drop_target_add(Evas_Object *obj __UNUSED__, Elm_Sel_Format format __UNUSED__,
-                                             Elm_Drag_State entercb __UNUSED__, void *enterdata __UNUSED__,
-                                             Elm_Drag_State leavecb __UNUSED__, void *leavedata __UNUSED__,
-                                             Elm_Drag_Pos poscb __UNUSED__, void *posdata __UNUSED__,
-                                             Elm_Drop_Cb dropcb __UNUSED__, void *dropdata __UNUSED__);
-static  Eina_Bool _local_elm_drop_target_del(Evas_Object *obj __UNUSED__);
-static Eina_Bool  _local_elm_drag_start(Evas_Object *obj __UNUSED__,
-                                        Elm_Sel_Format format __UNUSED__,
-                                        const char *data __UNUSED__,
-                                        Elm_Xdnd_Action action __UNUSED__,
-                                        Elm_Drag_Icon_Create_Cb createicon __UNUSED__,
-                                        void *createdata __UNUSED__,
-                                        Elm_Drag_Pos dragpos __UNUSED__,
-                                        void *dragdata __UNUSED__,
-                                        Elm_Drag_Accept acceptcb __UNUSED__,
-                                        void *acceptdata __UNUSED__,
-                                        Elm_Drag_State dragdone __UNUSED__,
-                                        void *donecbdata __UNUSED__);
-static Eina_Bool  _local_elm_selection_selection_has_owner(Evas_Object *obj __UNUSED__);
+static Eina_Bool  _local_elm_cnp_selection_set(Evas_Object *obj EINA_UNUSED, Elm_Sel_Type selection, Elm_Sel_Format format, const void *selbuf, size_t buflen);
+static void       _local_elm_cnp_selection_loss_callback_set(Evas_Object *obj EINA_UNUSED, Elm_Sel_Type selection EINA_UNUSED, Elm_Selection_Loss_Cb func EINA_UNUSED, const void *data EINA_UNUSED);
+static Eina_Bool  _local_elm_object_cnp_selection_clear(Evas_Object *obj EINA_UNUSED, Elm_Sel_Type selection);
+static Eina_Bool  _local_elm_cnp_selection_get(Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Format format EINA_UNUSED, Elm_Drop_Cb datacb, void *udata);
+static  Eina_Bool _local_elm_drop_target_add(Evas_Object *obj EINA_UNUSED, Elm_Sel_Format format EINA_UNUSED,
+                                             Elm_Drag_State entercb EINA_UNUSED, void *enterdata EINA_UNUSED,
+                                             Elm_Drag_State leavecb EINA_UNUSED, void *leavedata EINA_UNUSED,
+                                             Elm_Drag_Pos poscb EINA_UNUSED, void *posdata EINA_UNUSED,
+                                             Elm_Drop_Cb dropcb EINA_UNUSED, void *dropdata EINA_UNUSED);
+static  Eina_Bool _local_elm_drop_target_del(Evas_Object *obj EINA_UNUSED);
+static Eina_Bool  _local_elm_drag_start(Evas_Object *obj EINA_UNUSED,
+                                        Elm_Sel_Format format EINA_UNUSED,
+                                        const char *data EINA_UNUSED,
+                                        Elm_Xdnd_Action action EINA_UNUSED,
+                                        Elm_Drag_Icon_Create_Cb createicon EINA_UNUSED,
+                                        void *createdata EINA_UNUSED,
+                                        Elm_Drag_Pos dragpos EINA_UNUSED,
+                                        void *dragdata EINA_UNUSED,
+                                        Elm_Drag_Accept acceptcb EINA_UNUSED,
+                                        void *acceptdata EINA_UNUSED,
+                                        Elm_Drag_State dragdone EINA_UNUSED,
+                                        void *donecbdata EINA_UNUSED);
+static Eina_Bool  _local_elm_selection_selection_has_owner(Evas_Object *obj EINA_UNUSED);
 
 static void
 _local_get_job(void *data)
@@ -3367,7 +3367,7 @@ _local_elm_cnp_init(void)
 }
 
 static Eina_Bool
-_local_elm_cnp_selection_set(Evas_Object *obj __UNUSED__,
+_local_elm_cnp_selection_set(Evas_Object *obj EINA_UNUSED,
                              Elm_Sel_Type selection, Elm_Sel_Format format,
                              const void *selbuf, size_t buflen)
 {
@@ -3388,10 +3388,10 @@ _local_elm_cnp_selection_set(Evas_Object *obj __UNUSED__,
 }
 
 static void
-_local_elm_cnp_selection_loss_callback_set(Evas_Object *obj __UNUSED__,
-                                           Elm_Sel_Type selection __UNUSED__,
-                                           Elm_Selection_Loss_Cb func __UNUSED__,
-                                           const void *data __UNUSED__)
+_local_elm_cnp_selection_loss_callback_set(Evas_Object *obj EINA_UNUSED,
+                                           Elm_Sel_Type selection EINA_UNUSED,
+                                           Elm_Selection_Loss_Cb func EINA_UNUSED,
+                                           const void *data EINA_UNUSED)
 {
    _local_elm_cnp_init();
    // this doesnt need to do anything as we never lose selection to anyone
@@ -3399,7 +3399,7 @@ _local_elm_cnp_selection_loss_callback_set(Evas_Object *obj __UNUSED__,
 }
 
 static Eina_Bool
-_local_elm_object_cnp_selection_clear(Evas_Object *obj __UNUSED__,
+_local_elm_object_cnp_selection_clear(Evas_Object *obj EINA_UNUSED,
                                       Elm_Sel_Type selection)
 {
    _local_elm_cnp_init();
@@ -3413,7 +3413,7 @@ _local_elm_object_cnp_selection_clear(Evas_Object *obj __UNUSED__,
 static Eina_Bool
 _local_elm_cnp_selection_get(Evas_Object *obj,
                              Elm_Sel_Type selection,
-                             Elm_Sel_Format format __UNUSED__,
+                             Elm_Sel_Format format EINA_UNUSED,
                              Elm_Drop_Cb datacb, void *udata)
 {
    _local_elm_cnp_init();
@@ -3428,16 +3428,16 @@ _local_elm_cnp_selection_get(Evas_Object *obj,
 }
 
 static  Eina_Bool
-_local_elm_drop_target_add(Evas_Object *obj __UNUSED__,
-                           Elm_Sel_Format format __UNUSED__,
-                           Elm_Drag_State entercb __UNUSED__,
-                           void *enterdata __UNUSED__,
-                           Elm_Drag_State leavecb __UNUSED__,
-                           void *leavedata __UNUSED__,
-                           Elm_Drag_Pos poscb __UNUSED__,
-                           void *posdata __UNUSED__,
-                           Elm_Drop_Cb dropcb __UNUSED__,
-                           void *dropdata __UNUSED__)
+_local_elm_drop_target_add(Evas_Object *obj EINA_UNUSED,
+                           Elm_Sel_Format format EINA_UNUSED,
+                           Elm_Drag_State entercb EINA_UNUSED,
+                           void *enterdata EINA_UNUSED,
+                           Elm_Drag_State leavecb EINA_UNUSED,
+                           void *leavedata EINA_UNUSED,
+                           Elm_Drag_Pos poscb EINA_UNUSED,
+                           void *posdata EINA_UNUSED,
+                           Elm_Drop_Cb dropcb EINA_UNUSED,
+                           void *dropdata EINA_UNUSED)
 {
    // XXX: implement me
    _local_elm_cnp_init();
@@ -3445,7 +3445,7 @@ _local_elm_drop_target_add(Evas_Object *obj __UNUSED__,
 }
 
 static  Eina_Bool
-_local_elm_drop_target_del(Evas_Object *obj __UNUSED__)
+_local_elm_drop_target_del(Evas_Object *obj EINA_UNUSED)
 {
    // XXX: implement me
    _local_elm_cnp_init();
@@ -3453,18 +3453,18 @@ _local_elm_drop_target_del(Evas_Object *obj __UNUSED__)
 }
 
 static Eina_Bool
-_local_elm_drag_start(Evas_Object *obj __UNUSED__,
-                      Elm_Sel_Format format __UNUSED__,
-                      const char *data __UNUSED__,
-                      Elm_Xdnd_Action action __UNUSED__,
-                      Elm_Drag_Icon_Create_Cb createicon __UNUSED__,
-                      void *createdata __UNUSED__,
-                      Elm_Drag_Pos dragpos __UNUSED__,
-                      void *dragdata __UNUSED__,
-                      Elm_Drag_Accept acceptcb __UNUSED__,
-                      void *acceptdata __UNUSED__,
-                      Elm_Drag_State dragdone __UNUSED__,
-                      void *donecbdata __UNUSED__)
+_local_elm_drag_start(Evas_Object *obj EINA_UNUSED,
+                      Elm_Sel_Format format EINA_UNUSED,
+                      const char *data EINA_UNUSED,
+                      Elm_Xdnd_Action action EINA_UNUSED,
+                      Elm_Drag_Icon_Create_Cb createicon EINA_UNUSED,
+                      void *createdata EINA_UNUSED,
+                      Elm_Drag_Pos dragpos EINA_UNUSED,
+                      void *dragdata EINA_UNUSED,
+                      Elm_Drag_Accept acceptcb EINA_UNUSED,
+                      void *acceptdata EINA_UNUSED,
+                      Elm_Drag_State dragdone EINA_UNUSED,
+                      void *donecbdata EINA_UNUSED)
 {
    // XXX: implement me
    _local_elm_cnp_init();
@@ -3472,8 +3472,8 @@ _local_elm_drag_start(Evas_Object *obj __UNUSED__,
 }
 
 static Eina_Bool
-_local_elm_drag_action_set(Evas_Object *obj __UNUSED__,
-                           Elm_Xdnd_Action action __UNUSED__)
+_local_elm_drag_action_set(Evas_Object *obj EINA_UNUSED,
+                           Elm_Xdnd_Action action EINA_UNUSED)
 {
    // XXX: implement me
    _local_elm_cnp_init();
@@ -3481,7 +3481,7 @@ _local_elm_drag_action_set(Evas_Object *obj __UNUSED__,
 }
 
 static Eina_Bool
-_local_elm_selection_selection_has_owner(Evas_Object *obj __UNUSED__)
+_local_elm_selection_selection_has_owner(Evas_Object *obj EINA_UNUSED)
 {
    _local_elm_cnp_init();
    if (_local_selinfo[ELM_SEL_TYPE_CLIPBOARD].sel.buf) return EINA_TRUE;
@@ -3924,7 +3924,7 @@ _drag_item_container_cmp(const void *d1,
 }
 
 static void
-_cont_drag_done_cb(void *data, Evas_Object *obj __UNUSED__)
+_cont_drag_done_cb(void *data, Evas_Object *obj EINA_UNUSED)
 {
    Item_Container_Drag_Info *st = data;
    elm_widget_scroll_freeze_pop(st->obj);
@@ -4098,7 +4098,7 @@ _cont_obj_anim_start(void *data)
 }
 
 static void
-_cont_obj_mouse_down(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *event_info)
+_cont_obj_mouse_down(void *data, Evas *e, Evas_Object *obj EINA_UNUSED, void *event_info)
 {  /* Launch a timer to start dragging */
    Evas_Event_Mouse_Down *ev = event_info;
    cnp_debug("In - event %X\n", ev->event_flags);
@@ -4124,7 +4124,7 @@ _cont_obj_mouse_down(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *eve
 static Eina_Bool elm_drag_item_container_del_internal(Evas_Object *obj, Eina_Bool full);
 
 static void
-_cont_obj_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+_cont_obj_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
 {  /* Cancel any drag waiting to start on timeout */
    cnp_debug("In\n");
    if (((Evas_Event_Mouse_Move *)event_info)->event_flags & EVAS_EVENT_FLAG_ON_HOLD)
@@ -4146,7 +4146,7 @@ _cont_obj_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__
 }
 
 static void
-_cont_obj_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+_cont_obj_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
 {  /* Cancel any drag waiting to start on timeout */
    Item_Container_Drag_Info *st = data;
 

legacy/elementary/src/lib/elm_colorselector.c

@@ -453,7 +453,7 @@ _colors_set(Evas_Object *obj,
 static void
 _entry_changed_cb(void *data,
                   Evas_Object *obj,
-                  void *event_info __UNUSED__)
+                  void *event_info EINA_UNUSED)
 {
    Elm_Colorselector_Smart_Data *sd = data;
    Evas_Object *parent;
@@ -488,9 +488,9 @@ _entry_changed_cb(void *data,
 }
 
 #ifdef HAVE_ELEMENTARY_X
-static Eina_Bool _mouse_grab_pixels(void *data, int type __UNUSED__, void *event __UNUSED__);
-static Eina_Bool _key_up_cb(void *data, int type __UNUSED__, void *event __UNUSED__);
-static Eina_Bool _mouse_up_cb(void *data, int type __UNUSED__, void *event __UNUSED__);
+static Eina_Bool _mouse_grab_pixels(void *data, int type EINA_UNUSED, void *event EINA_UNUSED);
+static Eina_Bool _key_up_cb(void *data, int type EINA_UNUSED, void *event EINA_UNUSED);
+static Eina_Bool _mouse_up_cb(void *data, int type EINA_UNUSED, void *event EINA_UNUSED);
 
 static Ecore_X_Window
 _x11_elm_widget_xwin_get(const Evas_Object *obj)
@@ -514,7 +514,7 @@ _x11_elm_widget_xwin_get(const Evas_Object *obj)
 }
 
 static void
-_start_grab_pick_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
+_start_grab_pick_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    Evas_Object *o = data;
 
@@ -531,7 +531,7 @@ _start_grab_pick_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
 }
 
 static Eina_Bool
-_key_up_cb(void *data, int type __UNUSED__, void *event __UNUSED__)
+_key_up_cb(void *data, int type EINA_UNUSED, void *event EINA_UNUSED)
 {
    Evas_Object *o = data;
 
@@ -549,7 +549,7 @@ _key_up_cb(void *data, int type __UNUSED__, void *event __UNUSED__)
 }
 
 static Eina_Bool
-_mouse_up_cb(void *data, int type __UNUSED__, void *event __UNUSED__)
+_mouse_up_cb(void *data, int type EINA_UNUSED, void *event EINA_UNUSED)
 {
    const unsigned int *pixels;
    Evas_Object *o = data;
@@ -576,7 +576,7 @@ _mouse_up_cb(void *data, int type __UNUSED__, void *event __UNUSED__)
 }
 
 static Eina_Bool
-_mouse_grab_pixels(void *data, int type __UNUSED__, void *event __UNUSED__)
+_mouse_grab_pixels(void *data, int type EINA_UNUSED, void *event EINA_UNUSED)
 {
    Evas_Object *obj = data;
    Ecore_X_Visual visual;
@@ -637,7 +637,7 @@ _mouse_grab_pixels(void *data, int type __UNUSED__, void *event __UNUSED__)
 #endif
 
 static void
-_mouse_in_canvas(void *data, Evas *e __UNUSED__, void *event_info __UNUSED__)
+_mouse_in_canvas(void *data, Evas *e EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Evas_Object *obj = data;
    ELM_COLORSELECTOR_DATA_GET(obj, sd);
@@ -646,7 +646,7 @@ _mouse_in_canvas(void *data, Evas *e __UNUSED__, void *event_info __UNUSED__)
 }
 
 static void
-_mouse_out_canvas(void *data, Evas *e __UNUSED__, void *event_info __UNUSED__)
+_mouse_out_canvas(void *data, Evas *e EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Evas_Object *obj = data;
    ELM_COLORSELECTOR_DATA_GET(obj, sd);
@@ -755,8 +755,8 @@ _color_picker_add(Evas_Object *obj, Elm_Colorselector_Smart_Data *sd)
 static void
 _arrow_cb(void *data,
           Evas_Object *obj,
-          const char *emission __UNUSED__,
-          const char *source __UNUSED__)
+          const char *emission EINA_UNUSED,
+          const char *source EINA_UNUSED)
 {
    Color_Bar_Data *cb_data = data;
    double x, y;
@@ -768,7 +768,7 @@ _arrow_cb(void *data,
 static void
 _colorbar_cb(void *data,
              Evas *e,
-             Evas_Object *obj __UNUSED__,
+             Evas_Object *obj EINA_UNUSED,
              void *event_info)
 {
    Evas_Event_Mouse_Down *ev = event_info;
@@ -797,7 +797,7 @@ _colorbar_cb(void *data,
 static void
 _button_clicked_cb(void *data,
                    Evas_Object *obj,
-                   void *event_info __UNUSED__)
+                   void *event_info EINA_UNUSED)
 {
    Color_Bar_Data *cb_data = data;
    double x, y, step;
@@ -841,8 +841,8 @@ _button_clicked_cb(void *data,
 
 static void
 _button_repeat_cb(void *data,
-                  Evas_Object *obj __UNUSED__,
-                  void *event_info __UNUSED__)
+                  Evas_Object *obj EINA_UNUSED,
+                  void *event_info EINA_UNUSED)
 {
    Color_Bar_Data *cb_data = data;
    double x, y, step;
@@ -1289,9 +1289,9 @@ _on_color_long_press(void *data)
 
 static void
 _on_color_pressed(void *data,
-                  Evas *e __UNUSED__,
-                  Evas_Object *obj __UNUSED__,
-                  void *event_info __UNUSED__)
+                  Evas *e EINA_UNUSED,
+                  Evas_Object *obj EINA_UNUSED,
+                  void *event_info EINA_UNUSED)
 {
    Elm_Color_Item *item = (Elm_Color_Item *)data;
    Evas_Event_Mouse_Down *ev = event_info;
@@ -1311,9 +1311,9 @@ _on_color_pressed(void *data,
 
 static void
 _on_color_released(void *data,
-                   Evas *e __UNUSED__,
-                   Evas_Object *obj __UNUSED__,
-                   void *event_info __UNUSED__)
+                   Evas *e EINA_UNUSED,
+                   Evas_Object *obj EINA_UNUSED,
+                   void *event_info EINA_UNUSED)
 {
    Elm_Color_Item *item = (Elm_Color_Item *)data;
    Eina_List *l;
@@ -1340,7 +1340,7 @@ _on_color_released(void *data,
 }
 
 static char *
-_access_info_cb(void *data, Evas_Object *obj __UNUSED__)
+_access_info_cb(void *data, Evas_Object *obj EINA_UNUSED)
 {
    char *ret;
    Eina_Strbuf *buf;
@@ -1372,10 +1372,10 @@ _access_widget_item_register(Elm_Color_Item *it)
 }
 
 static void
-_item_resize(void *data __UNUSED__,
-             Evas *e __UNUSED__,
+_item_resize(void *data EINA_UNUSED,
+             Evas *e EINA_UNUSED,
              Evas_Object *obj,
-             void *event_info __UNUSED__)
+             void *event_info EINA_UNUSED)
 {
    elm_layout_sizing_eval(obj);
 }

legacy/elementary/src/lib/elm_config.c

@@ -97,8 +97,8 @@ static const char *_atom_names[ATOM_COUNT] =
 
 static Eina_Bool _prop_config_get(void);
 static void      _prop_config_set(void);
-static Eina_Bool _prop_change(void *data  __UNUSED__,
-                              int ev_type __UNUSED__,
+static Eina_Bool _prop_change(void *data  EINA_UNUSED,
+                              int ev_type EINA_UNUSED,
                               void       *ev);
 
 static void
@@ -203,7 +203,7 @@ _prop_config_set(void)
 }
 
 static Eina_Bool
-_prop_change_delay_cb(void *data __UNUSED__)
+_prop_change_delay_cb(void *data EINA_UNUSED)
 {
    char *s;
 
@@ -223,8 +223,8 @@ _prop_change_delay_cb(void *data __UNUSED__)
 }
 
 static Eina_Bool
-_prop_change(void *data  __UNUSED__,
-             int ev_type __UNUSED__,
+_prop_change(void *data  EINA_UNUSED,
+             int ev_type EINA_UNUSED,
              void       *ev)
 {
    Ecore_X_Event_Window_Property *event = ev;
@@ -967,7 +967,7 @@ _config_sub_apply(void)
 }
 
 static Eina_Bool
-_elm_cache_flush_cb(void *data __UNUSED__)
+_elm_cache_flush_cb(void *data EINA_UNUSED)
 {
    elm_cache_all_flush();
    return ECORE_CALLBACK_RENEW;

legacy/elementary/src/lib/elm_conform.c

@@ -350,8 +350,8 @@ _land_indicator_connect_cb(void *data)
 
 static void
 _land_indicator_disconnected(void *data,
-                             Evas_Object *obj __UNUSED__,
-                             void *event_info __UNUSED__)
+                             Evas_Object *obj EINA_UNUSED,
+                             void *event_info EINA_UNUSED)
 {
    Evas_Object *conform = data;
 
@@ -362,8 +362,8 @@ _land_indicator_disconnected(void *data,
 
 static void
 _port_indicator_disconnected(void *data,
-                             Evas_Object *obj __UNUSED__,
-                             void *event_info __UNUSED__)
+                             Evas_Object *obj EINA_UNUSED,
+                             void *event_info EINA_UNUSED)
 {
    Evas_Object *conform = data;
 
@@ -510,7 +510,7 @@ _indicator_opacity_set(Evas_Object *conformant, Elm_Win_Indicator_Opacity_Mode i
 static void
 _on_indicator_mode_changed(void *data,
                            Evas_Object *obj,
-                           void *event_info __UNUSED__)
+                           void *event_info EINA_UNUSED)
 {
    Evas_Object *conformant = data;
    Evas_Object *win = obj;
@@ -531,7 +531,7 @@ _on_indicator_mode_changed(void *data,
 static void
 _on_rotation_changed(void *data,
                      Evas_Object *obj,
-                     void *event_info __UNUSED__)
+                     void *event_info EINA_UNUSED)
 {
    int rot = 0;
    Evas_Object *win = obj;
@@ -644,10 +644,10 @@ _elm_conformant_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
  */
 
 static void
-_move_resize_cb(void *data __UNUSED__,
-                Evas *e __UNUSED__,
+_move_resize_cb(void *data EINA_UNUSED,
+                Evas *e EINA_UNUSED,
                 Evas_Object *obj,
-                void *event_info __UNUSED__)
+                void *event_info EINA_UNUSED)
 {
    Conformant_Part_Type part_type;
 
@@ -686,9 +686,9 @@ _show_region_job(void *data)
 #ifdef HAVE_ELEMENTARY_X
 static void
 _on_content_resize(void *data,
-                   Evas *e __UNUSED__,
-                   Evas_Object *obj __UNUSED__,
-                   void *event_info __UNUSED__)
+                   Evas *e EINA_UNUSED,
+                   Evas_Object *obj EINA_UNUSED,
+                   void *event_info EINA_UNUSED)
 {
    ELM_CONFORMANT_DATA_GET(data, sd);
 
@@ -819,7 +819,7 @@ _clipboard_state_change(Evas_Object *obj, Ecore_X_Event_Window_Property *ev)
 
 static Eina_Bool
 _on_prop_change(void *data,
-                int type __UNUSED__,
+                int type EINA_UNUSED,
                 void *event)
 {
    Ecore_X_Event_Window_Property *ev = event;

legacy/elementary/src/lib/elm_datetime.c

@@ -775,7 +775,7 @@ _field_list_init(Evas_Object *obj)
 }
 
 static char *
-_access_info_cb(void *data, Evas_Object *obj __UNUSED__)
+_access_info_cb(void *data, Evas_Object *obj EINA_UNUSED)
 {
    char *ret;
    Eina_Strbuf *buf;

legacy/elementary/src/lib/elm_dayselector.c

@@ -46,9 +46,9 @@ _elm_dayselector_smart_sizing_eval(Eo *obj, void *_pd EINA_UNUSED, va_list *list
 
 static void
 _dayselector_resize(void *data,
-                    Evas *e __UNUSED__,
-                    Evas_Object *obj __UNUSED__,
-                    void *event_info __UNUSED__)
+                    Evas *e EINA_UNUSED,
+                    Evas_Object *obj EINA_UNUSED,
+                    void *event_info EINA_UNUSED)
 {
    elm_layout_sizing_eval(data);
 }
@@ -162,9 +162,9 @@ _elm_dayselector_smart_theme(Eo *obj, void *_pd, va_list *list)
 
 static void
 _item_del_cb(void *data,
-             Evas *e __UNUSED__,
+             Evas *e EINA_UNUSED,
              Evas_Object *obj,
-             void *event_info __UNUSED__)
+             void *event_info EINA_UNUSED)
 {
    Eina_List *l;
    char buf[1024];
@@ -193,9 +193,9 @@ _item_del_cb(void *data,
 
 static void
 _item_signal_emit_cb(void *data,
-                     Evas_Object *obj __UNUSED__,
+                     Evas_Object *obj EINA_UNUSED,
                      const char *emission,
-                     const char *source __UNUSED__)
+                     const char *source EINA_UNUSED)
 {
    Elm_Dayselector_Item *it = data;
 
@@ -204,8 +204,8 @@ _item_signal_emit_cb(void *data,
 
 static void
 _item_clicked_cb(void *data,
-                 Evas_Object *obj __UNUSED__,
-                 void *event_info __UNUSED__)
+                 Evas_Object *obj EINA_UNUSED,
+                 void *event_info EINA_UNUSED)
 {
    Elm_Dayselector_Item *it = data;
 

legacy/elementary/src/lib/elm_diskselector.c

@@ -287,10 +287,10 @@ end:
 }
 
 static void
-_resize_cb(void *data __UNUSED__,
-           Evas *e __UNUSED__,
+_resize_cb(void *data EINA_UNUSED,
+           Evas *e EINA_UNUSED,
            Evas_Object *obj,
-           void *event_info __UNUSED__)
+           void *event_info EINA_UNUSED)
 {
    Evas_Coord w, h, vw = 0, vh = 0, mw = 0, mh = 0;
    ELM_DISKSELECTOR_DATA_GET(obj, sd);
@@ -579,9 +579,9 @@ _item_content_get_hook(const Elm_Object_Item *it,
 
 static void
 _item_click_cb(void *data,
-               Evas_Object *obj __UNUSED__,
-               const char *emission __UNUSED__,
-               const char *source __UNUSED__)
+               Evas_Object *obj EINA_UNUSED,
+               const char *emission EINA_UNUSED,
+               const char *source EINA_UNUSED)
 {
    Elm_Diskselector_Item *it = data;
 
@@ -599,7 +599,7 @@ _item_click_cb(void *data,
 }
 
 static char *
-_access_info_cb(void *data, Evas_Object *obj __UNUSED__)
+_access_info_cb(void *data, Evas_Object *obj EINA_UNUSED)
 {
    Elm_Diskselector_Item *it = (Elm_Diskselector_Item *)data;
    const char *txt = NULL;
@@ -1024,7 +1024,7 @@ _elm_diskselector_smart_event(Eo *obj, void *_pd, va_list *list)
 
 static void
 _scroll_cb(Evas_Object *obj,
-           void *data __UNUSED__)
+           void *data EINA_UNUSED)
 {
    Evas_Coord x, y, w, h, bw, x_boundary;
    unsigned int adjust_pixels;
@@ -1079,7 +1079,7 @@ _scroll_cb(Evas_Object *obj,
 
 static void
 _scroll_animate_stop_cb(Evas_Object *obj,
-                        void *data __UNUSED__)
+                        void *data EINA_UNUSED)
 {
    Elm_Diskselector_Item *it;
    Evas_Coord x, w, ox, ow;
@@ -1108,7 +1108,7 @@ _scroll_animate_stop_cb(Evas_Object *obj,
 
 static void
 _scroll_animate_start_cb(Evas_Object *obj,
-                         void *data __UNUSED__)
+                         void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call
      (obj, SIG_SCROLL_ANIM_START, elm_diskselector_selected_item_get(obj));
@@ -1116,7 +1116,7 @@ _scroll_animate_start_cb(Evas_Object *obj,
 
 static void
 _scroll_drag_start_cb(Evas_Object *obj,
-                      void *data __UNUSED__)
+                      void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call
      (obj, SIG_SCROLL_DRAG_START, elm_diskselector_selected_item_get(obj));
@@ -1124,7 +1124,7 @@ _scroll_drag_start_cb(Evas_Object *obj,
 
 static void
 _scroll_drag_stop_cb(Evas_Object *obj,
-                     void *data __UNUSED__)
+                     void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call
      (obj, SIG_SCROLL_DRAG_STOP, elm_diskselector_selected_item_get(obj));

legacy/elementary/src/lib/elm_entry.c

@@ -80,7 +80,7 @@ struct _Mod_Api
 };
 
 static Mod_Api *
-_module_find(Evas_Object *obj __UNUSED__)
+_module_find(Evas_Object *obj EINA_UNUSED)
 {
    static Elm_Module *m = NULL;
 
@@ -1055,8 +1055,8 @@ _hover_del_job(void *data)
 
 static void
 _hover_dismissed_cb(void *data,
-                    Evas_Object *obj __UNUSED__,
-                    void *event_info __UNUSED__)
+                    Evas_Object *obj EINA_UNUSED,
+                    void *event_info EINA_UNUSED)
 {
    ELM_ENTRY_DATA_GET(data, sd);
 
@@ -1078,8 +1078,8 @@ _hover_dismissed_cb(void *data,
 
 static void
 _hover_selected_cb(void *data,
-                   Evas_Object *obj __UNUSED__,
-                   void *event_info __UNUSED__)
+                   Evas_Object *obj EINA_UNUSED,
+                   void *event_info EINA_UNUSED)
 {
    ELM_ENTRY_DATA_GET(data, sd);
 
@@ -1172,8 +1172,8 @@ _elm_entry_entry_paste(Evas_Object *obj,
 
 static void
 _paste_cb(void *data,
-          Evas_Object *obj __UNUSED__,
-          void *event_info __UNUSED__)
+          Evas_Object *obj EINA_UNUSED,
+          void *event_info EINA_UNUSED)
 {
    Elm_Sel_Format formats = ELM_SEL_FORMAT_MARKUP;
 
@@ -1211,8 +1211,8 @@ _selection_store(Elm_Sel_Type seltype,
 
 static void
 _cut_cb(void *data,
-        Evas_Object *obj __UNUSED__,
-        void *event_info __UNUSED__)
+        Evas_Object *obj EINA_UNUSED,
+        void *event_info EINA_UNUSED)
 {
    ELM_ENTRY_DATA_GET(data, sd);
 
@@ -1234,8 +1234,8 @@ _cut_cb(void *data,
 
 static void
 _copy_cb(void *data,
-         Evas_Object *obj __UNUSED__,
-         void *event_info __UNUSED__)
+         Evas_Object *obj EINA_UNUSED,
+         void *event_info EINA_UNUSED)
 {
    ELM_ENTRY_DATA_GET(data, sd);
 
@@ -1253,8 +1253,8 @@ _copy_cb(void *data,
 
 static void
 _hover_cancel_cb(void *data,
-                 Evas_Object *obj __UNUSED__,
-                 void *event_info __UNUSED__)
+                 Evas_Object *obj EINA_UNUSED,
+                 void *event_info EINA_UNUSED)
 {
    ELM_ENTRY_DATA_GET(data, sd);
 
@@ -1270,8 +1270,8 @@ _hover_cancel_cb(void *data,
 
 static void
 _hover_item_clicked_cb(void *data,
-                       Evas_Object *obj __UNUSED__,
-                       void *event_info __UNUSED__)
+                       Evas_Object *obj EINA_UNUSED,
+                       void *event_info EINA_UNUSED)
 {
    Elm_Entry_Context_Menu_Item *it = data;
    if (!it) return;
@@ -1529,8 +1529,8 @@ _long_press_cb(void *data)
 
 static void
 _key_down_cb(void *data,
-               Evas *evas __UNUSED__,
-               Evas_Object *obj __UNUSED__,
+               Evas *evas EINA_UNUSED,
+               Evas_Object *obj EINA_UNUSED,
                void *event_info)
 {
    Evas_Event_Key_Down *ev = event_info;
@@ -1541,8 +1541,8 @@ _key_down_cb(void *data,
 
 static void
 _mouse_down_cb(void *data,
-               Evas *evas __UNUSED__,
-               Evas_Object *obj __UNUSED__,
+               Evas *evas EINA_UNUSED,
+               Evas_Object *obj EINA_UNUSED,
                void *event_info)
 {
    Evas_Event_Mouse_Down *ev = event_info;
@@ -1571,8 +1571,8 @@ _mouse_down_cb(void *data,
 
 static void
 _mouse_up_cb(void *data,
-             Evas *evas __UNUSED__,
-             Evas_Object *obj __UNUSED__,
+             Evas *evas EINA_UNUSED,
+             Evas_Object *obj EINA_UNUSED,
              void *event_info)
 {
    Evas_Event_Mouse_Up *ev = event_info;
@@ -1598,8 +1598,8 @@ _mouse_up_cb(void *data,
 
 static void
 _mouse_move_cb(void *data,
-               Evas *evas __UNUSED__,
-               Evas_Object *obj __UNUSED__,
+               Evas *evas EINA_UNUSED,
+               Evas_Object *obj EINA_UNUSED,
                void *event_info)
 {
    Evas_Event_Mouse_Move *ev = event_info;
@@ -1710,18 +1710,18 @@ _entry_changed_handle(void *data,
 
 static void
 _entry_changed_signal_cb(void *data,
-                         Evas_Object *obj __UNUSED__,
-                         const char *emission __UNUSED__,
-                         const char *source __UNUSED__)
+                         Evas_Object *obj EINA_UNUSED,
+                         const char *emission EINA_UNUSED,
+                         const char *source EINA_UNUSED)
 {
    _entry_changed_handle(data, SIG_CHANGED);
 }
 
 static void
 _entry_changed_user_signal_cb(void *data,
-                              Evas_Object *obj __UNUSED__,
-                              const char *emission __UNUSED__,
-                              const char *source __UNUSED__)
+                              Evas_Object *obj EINA_UNUSED,
+                              const char *emission EINA_UNUSED,
+                              const char *source EINA_UNUSED)
 {
    Elm_Entry_Change_Info info;
    Edje_Entry_Change_Info *edje_info = (Edje_Entry_Change_Info *)
@@ -1740,36 +1740,36 @@ _entry_changed_user_signal_cb(void *data,
 
 static void
 _entry_preedit_changed_signal_cb(void *data,
-                                 Evas_Object *obj __UNUSED__,
-                                 const char *emission __UNUSED__,
-                                 const char *source __UNUSED__)
+                                 Evas_Object *obj EINA_UNUSED,
+                                 const char *emission EINA_UNUSED,
+                                 const char *source EINA_UNUSED)
 {
    _entry_changed_handle(data, SIG_PREEDIT_CHANGED);
 }
 
 static void
 _entry_undo_request_signal_cb(void *data,
-                              Evas_Object *obj __UNUSED__,
-                              const char *emission __UNUSED__,
-                              const char *source __UNUSED__)
+                              Evas_Object *obj EINA_UNUSED,
+                              const char *emission EINA_UNUSED,
+                              const char *source EINA_UNUSED)
 {
    evas_object_smart_callback_call(data, SIG_UNDO_REQUEST, NULL);
 }
 
 static void
 _entry_redo_request_signal_cb(void *data,
-                              Evas_Object *obj __UNUSED__,
-                              const char *emission __UNUSED__,
-                              const char *source __UNUSED__)
+                              Evas_Object *obj EINA_UNUSED,
+                              const char *emission EINA_UNUSED,
+                              const char *source EINA_UNUSED)
 {
    evas_object_smart_callback_call(data, SIG_REDO_REQUEST, NULL);
 }
 
 static void
 _entry_selection_start_signal_cb(void *data,
-                                 Evas_Object *obj __UNUSED__,
-                                 const char *emission __UNUSED__,
-                                 const char *source __UNUSED__)
+                                 Evas_Object *obj EINA_UNUSED,
+                                 const char *emission EINA_UNUSED,
+                                 const char *source EINA_UNUSED)
 {
    const Eina_List *l;
    Evas_Object *entry;
@@ -1791,27 +1791,27 @@ _entry_selection_start_signal_cb(void *data,
 
 static void
 _entry_selection_all_signal_cb(void *data,
-                               Evas_Object *obj __UNUSED__,
-                               const char *emission __UNUSED__,
-                               const char *source __UNUSED__)
+                               Evas_Object *obj EINA_UNUSED,
+                               const char *emission EINA_UNUSED,
+                               const char *source EINA_UNUSED)
 {
    elm_entry_select_all(data);
 }
 
 static void
 _entry_selection_none_signal_cb(void *data,
-                                Evas_Object *obj __UNUSED__,
-                                const char *emission __UNUSED__,
-                                const char *source __UNUSED__)
+                                Evas_Object *obj EINA_UNUSED,
+                                const char *emission EINA_UNUSED,
+                                const char *source EINA_UNUSED)
 {
    elm_entry_select_none(data);
 }
 
 static void
 _entry_selection_changed_signal_cb(void *data,
-                                   Evas_Object *obj __UNUSED__,
-                                   const char *emission __UNUSED__,
-                                   const char *source __UNUSED__)
+                                   Evas_Object *obj EINA_UNUSED,
+                                   const char *emission EINA_UNUSED,
+                                   const char *source EINA_UNUSED)
 {
    ELM_ENTRY_DATA_GET(data, sd);
 
@@ -1823,9 +1823,9 @@ _entry_selection_changed_signal_cb(void *data,
 
 static void
 _entry_selection_cleared_signal_cb(void *data,
-                                   Evas_Object *obj __UNUSED__,
-                                   const char *emission __UNUSED__,
-                                   const char *source __UNUSED__)
+                                   Evas_Object *obj EINA_UNUSED,
+                                   const char *emission EINA_UNUSED,
+                                   const char *source EINA_UNUSED)
 {
    ELM_ENTRY_DATA_GET(data, sd);
 
@@ -1862,9 +1862,9 @@ _entry_selection_cleared_signal_cb(void *data,
 
 static void
 _entry_paste_request_signal_cb(void *data,
-                               Evas_Object *obj __UNUSED__,
+                               Evas_Object *obj EINA_UNUSED,
                                const char *emission,
-                               const char *source __UNUSED__)
+                               const char *source EINA_UNUSED)
 {
    Evas_Object *top;
 
@@ -1894,27 +1894,27 @@ _entry_paste_request_signal_cb(void *data,
 
 static void
 _entry_copy_notify_signal_cb(void *data,
-                             Evas_Object *obj __UNUSED__,
-                             const char *emission __UNUSED__,
-                             const char *source __UNUSED__)
+                             Evas_Object *obj EINA_UNUSED,
+                             const char *emission EINA_UNUSED,
+                             const char *source EINA_UNUSED)
 {
    _copy_cb(data, NULL, NULL);
 }
 
 static void
 _entry_cut_notify_signal_cb(void *data,
-                            Evas_Object *obj __UNUSED__,
-                            const char *emission __UNUSED__,
-                            const char *source __UNUSED__)
+                            Evas_Object *obj EINA_UNUSED,
+                            const char *emission EINA_UNUSED,
+                            const char *source EINA_UNUSED)
 {
    _cut_cb(data, NULL, NULL);
 }
 
 static void
 _entry_cursor_changed_signal_cb(void *data,
-                                Evas_Object *obj __UNUSED__,
-                                const char *emission __UNUSED__,
-                                const char *source __UNUSED__)
+                                Evas_Object *obj EINA_UNUSED,
+                                const char *emission EINA_UNUSED,
+                                const char *source EINA_UNUSED)
 {
    ELM_ENTRY_DATA_GET(data, sd);
    sd->cursor_pos = edje_object_part_text_cursor_pos_get
@@ -1927,9 +1927,9 @@ _entry_cursor_changed_signal_cb(void *data,
 
 static void
 _entry_cursor_changed_manual_signal_cb(void *data,
-                                       Evas_Object *obj __UNUSED__,
-                                       const char *emission __UNUSED__,
-                                       const char *source __UNUSED__)
+                                       Evas_Object *obj EINA_UNUSED,
+                                       const char *emission EINA_UNUSED,
+                                       const char *source EINA_UNUSED)
 {
    evas_object_smart_callback_call(data, SIG_CURSOR_CHANGED_MANUAL, NULL);
 }
@@ -1967,9 +1967,9 @@ _signal_anchor_geoms_do_things_with_lol(Elm_Entry_Smart_Data *sd,
 
 static void
 _entry_anchor_down_signal_cb(void *data,
-                             Evas_Object *obj __UNUSED__,
-                             const char *emission __UNUSED__,
-                             const char *source __UNUSED__)
+                             Evas_Object *obj EINA_UNUSED,
+                             const char *emission EINA_UNUSED,
+                             const char *source EINA_UNUSED)
 {
    Elm_Entry_Anchor_Info ei;
    const char *p;
@@ -1990,9 +1990,9 @@ _entry_anchor_down_signal_cb(void *data,
 
 static void
 _entry_anchor_up_signal_cb(void *data,
-                           Evas_Object *obj __UNUSED__,
-                           const char *emission __UNUSED__,
-                           const char *source __UNUSED__)
+                           Evas_Object *obj EINA_UNUSED,
+                           const char *emission EINA_UNUSED,
+                           const char *source EINA_UNUSED)
 {
    Elm_Entry_Anchor_Info ei;
    const char *p;
@@ -2013,9 +2013,9 @@ _entry_anchor_up_signal_cb(void *data,
 
 static void
 _anchor_hover_del_cb(void *data,
-                     Evas *e __UNUSED__,
-                     Evas_Object *obj __UNUSED__,
-                     void *event_info __UNUSED__)
+                     Evas *e EINA_UNUSED,
+                     Evas_Object *obj EINA_UNUSED,
+                     void *event_info EINA_UNUSED)
 {
    ELM_ENTRY_DATA_GET(data, sd);
 
@@ -2026,8 +2026,8 @@ _anchor_hover_del_cb(void *data,
 
 static void
 _anchor_hover_clicked_cb(void *data,
-                         Evas_Object *obj __UNUSED__,
-                         void *event_info __UNUSED__)
+                         Evas_Object *obj EINA_UNUSED,
+                         void *event_info EINA_UNUSED)
 {
    elm_entry_anchor_hover_end(data);
 }
@@ -2112,9 +2112,9 @@ _entry_hover_anchor_clicked_do(Evas_Object *obj,
 
 static void
 _entry_anchor_clicked_signal_cb(void *data,
-                                Evas_Object *obj __UNUSED__,
+                                Evas_Object *obj EINA_UNUSED,
                                 const char *emission,
-                                const char *source __UNUSED__)
+                                const char *source EINA_UNUSED)
 {
    Elm_Entry_Anchor_Info ei;
    const char *p;
@@ -2137,18 +2137,18 @@ _entry_anchor_clicked_signal_cb(void *data,
 }
 
 static void
-_entry_anchor_move_signal_cb(void *data __UNUSED__,
-                             Evas_Object *obj __UNUSED__,
-                             const char *emission __UNUSED__,
-                             const char *source __UNUSED__)
+_entry_anchor_move_signal_cb(void *data EINA_UNUSED,
+                             Evas_Object *obj EINA_UNUSED,
+                             const char *emission EINA_UNUSED,
+                             const char *source EINA_UNUSED)
 {
 }
 
 static void
 _entry_anchor_in_signal_cb(void *data,
-                           Evas_Object *obj __UNUSED__,
-                           const char *emission __UNUSED__,
-                           const char *source __UNUSED__)
+                           Evas_Object *obj EINA_UNUSED,
+                           const char *emission EINA_UNUSED,
+                           const char *source EINA_UNUSED)
 {
    Elm_Entry_Anchor_Info ei;
 
@@ -2166,9 +2166,9 @@ _entry_anchor_in_signal_cb(void *data,
 
 static void
 _entry_anchor_out_signal_cb(void *data,
-                            Evas_Object *obj __UNUSED__,
-                            const char *emission __UNUSED__,
-                            const char *source __UNUSED__)
+                            Evas_Object *obj EINA_UNUSED,
+                            const char *emission EINA_UNUSED,
+                            const char *source EINA_UNUSED)
 {
    Elm_Entry_Anchor_Info ei;
 
@@ -2186,54 +2186,54 @@ _entry_anchor_out_signal_cb(void *data,
 
 static void
 _entry_key_enter_signal_cb(void *data,
-                           Evas_Object *obj __UNUSED__,
-                           const char *emission __UNUSED__,
-                           const char *source __UNUSED__)
+                           Evas_Object *obj EINA_UNUSED,
+                           const char *emission EINA_UNUSED,
+                           const char *source EINA_UNUSED)
 {
    evas_object_smart_callback_call(data, SIG_ACTIVATED, NULL);
 }
 
 static void
 _entry_key_escape_signal_cb(void *data,
-                            Evas_Object *obj __UNUSED__,
-                            const char *emission __UNUSED__,
-                            const char *source __UNUSED__)
+                            Evas_Object *obj EINA_UNUSED,
+                            const char *emission EINA_UNUSED,
+                            const char *source EINA_UNUSED)
 {
    evas_object_smart_callback_call(data, SIG_ABORTED, NULL);
 }
 
 static void
 _entry_mouse_down_signal_cb(void *data,
-                            Evas_Object *obj __UNUSED__,
-                            const char *emission __UNUSED__,
-                            const char *source __UNUSED__)
+                            Evas_Object *obj EINA_UNUSED,
+                            const char *emission EINA_UNUSED,
+                            const char *source EINA_UNUSED)
 {
    evas_object_smart_callback_call(data, SIG_PRESS, NULL);
 }
 
 static void
 _entry_mouse_clicked_signal_cb(void *data,
-                               Evas_Object *obj __UNUSED__,
-                               const char *emission __UNUSED__,
-                               const char *source __UNUSED__)
+                               Evas_Object *obj EINA_UNUSED,
+                               const char *emission EINA_UNUSED,
+                               const char *source EINA_UNUSED)
 {
    evas_object_smart_callback_call(data, SIG_CLICKED, NULL);
 }
 
 static void
 _entry_mouse_double_signal_cb(void *data,
-                              Evas_Object *obj __UNUSED__,
-                              const char *emission __UNUSED__,
-                              const char *source __UNUSED__)
+                              Evas_Object *obj EINA_UNUSED,
+                              const char *emission EINA_UNUSED,
+                              const char *source EINA_UNUSED)
 {
    evas_object_smart_callback_call(data, SIG_CLICKED_DOUBLE, NULL);
 }
 
 static void
 _entry_mouse_triple_signal_cb(void *data,
-                              Evas_Object *obj __UNUSED__,
-                              const char *emission __UNUSED__,
-                              const char *source __UNUSED__)
+                              Evas_Object *obj EINA_UNUSED,
+                              const char *emission EINA_UNUSED,
+                              const char *source EINA_UNUSED)
 {
    evas_object_smart_callback_call(data, SIG_CLICKED_TRIPLE, NULL);
 }
@@ -2241,7 +2241,7 @@ _entry_mouse_triple_signal_cb(void *data,
 #ifdef HAVE_ELEMENTARY_X
 static Eina_Bool
 _event_selection_notify(void *data,
-                        int type __UNUSED__,
+                        int type EINA_UNUSED,
                         void *event)
 {
    Ecore_X_Event_Selection_Notify *ev = event;
@@ -2300,9 +2300,9 @@ _event_selection_notify(void *data,
 }
 
 static Eina_Bool
-_event_selection_clear(void *data __UNUSED__,
-                       int type __UNUSED__,
-                       void *event __UNUSED__)
+_event_selection_clear(void *data EINA_UNUSED,
+                       int type EINA_UNUSED,
+                       void *event EINA_UNUSED)
 {
    Ecore_X_Event_Selection_Clear *ev = event;
 
@@ -2320,7 +2320,7 @@ _event_selection_clear(void *data __UNUSED__,
 #endif
 
 static Eina_Bool
-_drag_drop_cb(void *data __UNUSED__,
+_drag_drop_cb(void *data EINA_UNUSED,
               Evas_Object *obj,
               Elm_Selection_Data *drop)
 {
@@ -2344,8 +2344,8 @@ _drag_drop_cb(void *data __UNUSED__,
 
 static Evas_Object *
 _item_get(void *data,
-          Evas_Object *edje __UNUSED__,
-          const char *part __UNUSED__,
+          Evas_Object *edje EINA_UNUSED,
+          const char *part EINA_UNUSED,
           const char *item)
 {
    Eina_List *l;
@@ -2390,8 +2390,8 @@ _item_get(void *data,
 
 static void
 _markup_filter_cb(void *data,
-                  Evas_Object *edje __UNUSED__,
-                  const char *part __UNUSED__,
+                  Evas_Object *edje EINA_UNUSED,
+                  const char *part EINA_UNUSED,
                   char **text)
 {
    Eina_List *l;
@@ -2836,7 +2836,7 @@ proceed:
 }
 
 static char *
-_access_info_cb(void *data __UNUSED__, Evas_Object *obj)
+_access_info_cb(void *data EINA_UNUSED, Evas_Object *obj)
 {
    const char *txt;
 
@@ -2853,7 +2853,7 @@ _access_info_cb(void *data __UNUSED__, Evas_Object *obj)
 }
 
 static char *
-_access_state_cb(void *data __UNUSED__, Evas_Object *obj)
+_access_state_cb(void *data EINA_UNUSED, Evas_Object *obj)
 {
    Eina_Strbuf *buf;
    char *ret;
@@ -2953,9 +2953,9 @@ _entry_selection_callbacks_register(Evas_Object *obj)
 
 static void
 _resize_cb(void *data,
-           Evas *e __UNUSED__,
-           Evas_Object *obj __UNUSED__,
-           void *event_info __UNUSED__)
+           Evas *e EINA_UNUSED,
+           Evas_Object *obj EINA_UNUSED,
+           void *event_info EINA_UNUSED)
 {
    ELM_ENTRY_DATA_GET(data, sd);
 
@@ -5625,9 +5625,9 @@ _imf_context_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 /* START - ANCHOR HOVER */
 static void
 _anchor_parent_del_cb(void *data,
-                      Evas *e __UNUSED__,
-                      Evas_Object *obj __UNUSED__,
-                      void *event_info __UNUSED__)
+                      Evas *e EINA_UNUSED,
+                      Evas_Object *obj EINA_UNUSED,
+                      void *event_info EINA_UNUSED)
 {
    ELM_ENTRY_DATA_GET(data, sd);
 

legacy/elementary/src/lib/elm_factory.c

@@ -26,10 +26,10 @@ static Eina_Bool _focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction di
 static void _sizing_eval(Evas_Object *obj);
 static void _eval(Evas_Object *obj);
 static void _changed(Evas_Object *obj);
-static void _move(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__);
-static void _resize(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__);
-static void _child_change(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__);
-static void _child_del(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__);
+static void _move(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED);
+static void _resize(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED);
+static void _child_change(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED);
+static void _child_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED);
 static void _content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content);
 static Evas_Object *_content_get_hook(const Evas_Object *obj, const char *part);
 static Evas_Object *_content_unset_hook(Evas_Object *obj, const char *part);
@@ -171,7 +171,7 @@ _changed(Evas_Object *obj)
 }
 
 static void
-_move(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+_move(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
@@ -180,7 +180,7 @@ _move(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_i
 }
 
 static void
-_resize(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+_resize(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
@@ -189,7 +189,7 @@ _resize(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event
 }
 
 static void
-_child_change(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+_child_change(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Widget_Data *wd = elm_widget_data_get(data);
    if (!wd) return;
@@ -199,7 +199,7 @@ _child_change(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUS
 }
 
 static void
-_child_del(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+_child_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    Evas_Object *fobj = data;
    Widget_Data *wd = elm_widget_data_get(fobj);

legacy/elementary/src/lib/elm_flip.c

@@ -173,9 +173,9 @@ _elm_flip_smart_focus_direction(Eo *obj, void *_pd, va_list *list)
 
 static void
 _changed_size_hints_cb(void *data,
-                       Evas *e __UNUSED__,
-                       Evas_Object *obj __UNUSED__,
-                       void *event_info __UNUSED__)
+                       Evas *e EINA_UNUSED,
+                       Evas_Object *obj EINA_UNUSED,
+                       void *event_info EINA_UNUSED)
 {
    _sizing_eval(data);
 }
@@ -262,10 +262,10 @@ _slice_new(Evas_Object *container_obj,
 static void
 _slice_apply(Elm_Flip_Smart_Data *sd,
              Slice *sl,
-             Evas_Coord x __UNUSED__,
-             Evas_Coord y __UNUSED__,
+             Evas_Coord x EINA_UNUSED,
+             Evas_Coord y EINA_UNUSED,
              Evas_Coord w,
-             Evas_Coord h __UNUSED__,
+             Evas_Coord h EINA_UNUSED,
              Evas_Coord ox,
              Evas_Coord oy,
              Evas_Coord ow,
@@ -317,7 +317,7 @@ _slice_apply(Elm_Flip_Smart_Data *sd,
 }
 
 static void
-_slice_3d(Elm_Flip_Smart_Data *sd __UNUSED__,
+_slice_3d(Elm_Flip_Smart_Data *sd EINA_UNUSED,
           Slice *sl,
           Evas_Coord x,
           Evas_Coord y,
@@ -345,7 +345,7 @@ _slice_3d(Elm_Flip_Smart_Data *sd __UNUSED__,
 }
 
 static void
-_slice_light(Elm_Flip_Smart_Data *sd __UNUSED__,
+_slice_light(Elm_Flip_Smart_Data *sd EINA_UNUSED,
              Slice *sl,
              Evas_Coord x,
              Evas_Coord y,
@@ -381,7 +381,7 @@ _slice_light(Elm_Flip_Smart_Data *sd __UNUSED__,
 }
 
 static void
-_slice_xyz(Elm_Flip_Smart_Data *sd __UNUSED__,
+_slice_xyz(Elm_Flip_Smart_Data *sd EINA_UNUSED,
            Slice *sl,
            double xx1,
            double yy1,
@@ -403,7 +403,7 @@ _slice_xyz(Elm_Flip_Smart_Data *sd __UNUSED__,
 }
 
 static void
-_slice_uv(Elm_Flip_Smart_Data *sd __UNUSED__,
+_slice_uv(Elm_Flip_Smart_Data *sd EINA_UNUSED,
           Slice *sl,
           double u1,
           double v1,
@@ -1373,19 +1373,19 @@ _flip(Evas_Object *obj)
  * happens that smarts callbacks on them happen before we have the new
  * values, so using event callbacks instead */
 static void
-_on_move(void *data __UNUSED__,
-         Evas *e __UNUSED__,
+_on_move(void *data EINA_UNUSED,
+         Evas *e EINA_UNUSED,
          Evas_Object *obj,
-         void *event_info __UNUSED__)
+         void *event_info EINA_UNUSED)
 {
    _configure(obj);
 }
 
 static void
-_on_resize(void *data __UNUSED__,
-           Evas *e __UNUSED__,
+_on_resize(void *data EINA_UNUSED,
+           Evas *e EINA_UNUSED,
            Evas_Object *obj,
-           void *event_info __UNUSED__)
+           void *event_info EINA_UNUSED)
 {
    _configure(obj);
 }
@@ -1579,8 +1579,8 @@ _update_job(void *data)
 
 static void
 _down_cb(void *data,
-         Evas *e __UNUSED__,
-         Evas_Object *obj __UNUSED__,
+         Evas *e EINA_UNUSED,
+         Evas_Object *obj EINA_UNUSED,
          void *event_info)
 {
    Evas_Event_Mouse_Down *ev = event_info;
@@ -1605,8 +1605,8 @@ _down_cb(void *data,
 
 static void
 _up_cb(void *data,
-       Evas *e __UNUSED__,
-       Evas_Object *obj __UNUSED__,
+       Evas *e EINA_UNUSED,
+       Evas_Object *obj EINA_UNUSED,
        void *event_info)
 {
    Evas_Event_Mouse_Up *ev = event_info;
@@ -1664,8 +1664,8 @@ _up_cb(void *data,
 
 static void
 _move_cb(void *data,
-         Evas *e __UNUSED__,
-         Evas_Object *obj __UNUSED__,
+         Evas *e EINA_UNUSED,
+         Evas_Object *obj EINA_UNUSED,
          void *event_info)
 {
    Evas_Event_Mouse_Move *ev = event_info;
@@ -1939,9 +1939,9 @@ _front_visible_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 
 EAPI void
 elm_flip_perspective_set(Evas_Object *obj,
-                         Evas_Coord foc __UNUSED__,
-                         Evas_Coord x __UNUSED__,
-                         Evas_Coord y __UNUSED__)
+                         Evas_Coord foc EINA_UNUSED,
+                         Evas_Coord x EINA_UNUSED,
+                         Evas_Coord y EINA_UNUSED)
 {
    ELM_FLIP_CHECK(obj);
 }

legacy/elementary/src/lib/elm_flipselector.c

@@ -489,9 +489,9 @@ _signal_val_up(void *data)
 
 static void
 _signal_val_up_start(void *data,
-                     Evas_Object *obj __UNUSED__,
-                     const char *emission __UNUSED__,
-                     const char *source __UNUSED__)
+                     Evas_Object *obj EINA_UNUSED,
+                     const char *emission EINA_UNUSED,
+                     const char *source EINA_UNUSED)
 {
    ELM_FLIPSELECTOR_DATA_GET(data, sd);
 
@@ -522,9 +522,9 @@ _signal_val_down(void *data)
 
 static void
 _signal_val_down_start(void *data,
-                       Evas_Object *obj __UNUSED__,
-                       const char *emission __UNUSED__,
-                       const char *source __UNUSED__)
+                       Evas_Object *obj EINA_UNUSED,
+                       const char *emission EINA_UNUSED,
+                       const char *source EINA_UNUSED)
 {
    ELM_FLIPSELECTOR_DATA_GET(data, sd);
 
@@ -538,9 +538,9 @@ _signal_val_down_start(void *data,
 
 static void
 _signal_val_change_stop(void *data,
-                        Evas_Object *obj __UNUSED__,
-                        const char *emission __UNUSED__,
-                        const char *source __UNUSED__)
+                        Evas_Object *obj EINA_UNUSED,
+                        const char *emission EINA_UNUSED,
+                        const char *source EINA_UNUSED)
 {
    ELM_FLIPSELECTOR_DATA_GET(data, sd);
 

legacy/elementary/src/lib/elm_font.c

@@ -115,7 +115,7 @@ _elm_font_properties_free(Elm_Font_Properties *efp)
 }
 
 static Eina_Bool
-_font_hash_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__)
+_font_hash_free_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata EINA_UNUSED)
 {
    Elm_Font_Properties *efp;
 

legacy/elementary/src/lib/elm_frame.c

@@ -110,17 +110,17 @@ _elm_frame_smart_focus_direction(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_
 
 static void
 _recalc(void *data,
-        Evas_Object *obj __UNUSED__,
-        void *event_info __UNUSED__)
+        Evas_Object *obj EINA_UNUSED,
+        void *event_info EINA_UNUSED)
 {
    elm_layout_sizing_eval(data);
 }
 
 static void
 _on_recalc_done(void *data,
-                Evas_Object *obj __UNUSED__,
-                const char *sig __UNUSED__,
-                const char *src __UNUSED__)
+                Evas_Object *obj EINA_UNUSED,
+                const char *sig EINA_UNUSED,
+                const char *src EINA_UNUSED)
 {
    ELM_FRAME_DATA_GET(data, sd);
    ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
@@ -134,9 +134,9 @@ _on_recalc_done(void *data,
 
 static void
 _on_frame_clicked(void *data,
-                  Evas_Object *obj __UNUSED__,
-                  const char *sig __UNUSED__,
-                  const char *src __UNUSED__)
+                  Evas_Object *obj EINA_UNUSED,
+                  const char *sig EINA_UNUSED,
+                  const char *src EINA_UNUSED)
 {
    ELM_FRAME_DATA_GET(data, sd);
    ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);

legacy/elementary/src/lib/elm_gengrid.c

@@ -314,7 +314,7 @@ _item_unselect(Elm_Gen_Item *it)
 
 static void
 _item_mouse_move_cb(void *data,
-                    Evas *evas __UNUSED__,
+                    Evas *evas EINA_UNUSED,
                     Evas_Object *obj,
                     void *event_info)
 {
@@ -484,7 +484,7 @@ _item_highlight(Elm_Gen_Item *it)
 
 static void
 _item_mouse_down_cb(void *data,
-                    Evas *evas __UNUSED__,
+                    Evas *evas EINA_UNUSED,
                     Evas_Object *obj,
                     void *event_info)
 {
@@ -558,8 +558,8 @@ _elm_gengrid_item_unrealize(Elm_Gen_Item *it,
 
 static void
 _item_mouse_up_cb(void *data,
-                  Evas *evas __UNUSED__,
-                  Evas_Object *obj __UNUSED__,
+                  Evas *evas EINA_UNUSED,
+                  Evas_Object *obj EINA_UNUSED,
                   void *event_info)
 {
    Evas_Event_Mouse_Up *ev = event_info;
@@ -671,7 +671,7 @@ _item_unrealize_cb(Elm_Gen_Item *it)
 }
 
 static char *
-_access_info_cb(void *data, Evas_Object *obj __UNUSED__)
+_access_info_cb(void *data, Evas_Object *obj EINA_UNUSED)
 {
    Elm_Gen_Item *it = (Elm_Gen_Item *)data;
    ELM_GENGRID_ITEM_CHECK_OR_RETURN(it, NULL);
@@ -696,7 +696,7 @@ _access_info_cb(void *data, Evas_Object *obj __UNUSED__)
 }
 
 static char *
-_access_state_cb(void *data, Evas_Object *obj __UNUSED__)
+_access_state_cb(void *data, Evas_Object *obj EINA_UNUSED)
 {
    Elm_Gen_Item *it = (Elm_Gen_Item *)data;
    ELM_GENGRID_ITEM_CHECK_OR_RETURN(it, NULL);
@@ -2083,70 +2083,70 @@ _item_del(Elm_Gen_Item *it)
 
 static void
 _scroll_animate_start_cb(Evas_Object *obj,
-                         void *data __UNUSED__)
+                         void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call(obj, SIG_SCROLL_ANIM_START, NULL);
 }
 
 static void
 _scroll_animate_stop_cb(Evas_Object *obj,
-                        void *data __UNUSED__)
+                        void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call(obj, SIG_SCROLL_ANIM_STOP, NULL);
 }
 
 static void
 _scroll_drag_start_cb(Evas_Object *obj,
-                      void *data __UNUSED__)
+                      void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call(obj, SIG_SCROLL_DRAG_START, NULL);
 }
 
 static void
 _scroll_drag_stop_cb(Evas_Object *obj,
-                     void *data __UNUSED__)
+                     void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call(obj, SIG_SCROLL_DRAG_STOP, NULL);
 }
 
 static void
 _edge_left_cb(Evas_Object *obj,
-              void *data __UNUSED__)
+              void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call(obj, SIG_EDGE_LEFT, NULL);
 }
 
 static void
 _edge_right_cb(Evas_Object *obj,
-               void *data __UNUSED__)
+               void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call(obj, SIG_EDGE_RIGHT, NULL);
 }
 
 static void
 _edge_top_cb(Evas_Object *obj,
-             void *data __UNUSED__)
+             void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call(obj, SIG_EDGE_TOP, NULL);
 }
 
 static void
 _edge_bottom_cb(Evas_Object *obj,
-                void *data __UNUSED__)
+                void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call(obj, SIG_EDGE_BOTTOM, NULL);
 }
 
 static void
 _scroll_page_change_cb(Evas_Object *obj,
-                     void *data __UNUSED__)
+                     void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call(obj, SIG_SCROLL_PAGE_CHANGE, NULL);
 }
 
 static void
 _scroll_cb(Evas_Object *obj,
-           void *data __UNUSED__)
+           void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call(obj, SIG_SCROLL, NULL);
 }
@@ -3215,9 +3215,9 @@ _realized_items_update(Eo *obj, void *_pd EINA_UNUSED, va_list *list_unused EINA
 
 static Evas_Object *
 _elm_gengrid_item_label_create(void *data,
-                               Evas_Object *obj __UNUSED__,
+                               Evas_Object *obj EINA_UNUSED,
                                Evas_Object *tooltip,
-                               void *it   __UNUSED__)
+                               void *it   EINA_UNUSED)
 {
    Evas_Object *label = elm_label_add(tooltip);
    if (!label)
@@ -3229,8 +3229,8 @@ _elm_gengrid_item_label_create(void *data,
 
 static void
 _elm_gengrid_item_label_del_cb(void *data,
-                               Evas_Object *obj __UNUSED__,
-                               void *event_info __UNUSED__)
+                               Evas_Object *obj EINA_UNUSED,
+                               void *event_info EINA_UNUSED)
 {
    eina_stringshare_del(data);
 }

legacy/elementary/src/lib/elm_genlist.c

@@ -105,8 +105,8 @@ static void      _calc_job(void *);
 static Eina_Bool _item_block_recalc(Item_Block *, int, Eina_Bool);
 static void      _item_mouse_callbacks_add(Elm_Gen_Item *, Evas_Object *);
 static void      _item_mouse_callbacks_del(Elm_Gen_Item *, Evas_Object *);
-static void      _access_activate_cb(void *data __UNUSED__,
-                                     Evas_Object *part_obj __UNUSED__,
+static void      _access_activate_cb(void *data EINA_UNUSED,
+                                     Evas_Object *part_obj EINA_UNUSED,
                                      Elm_Object_Item *item);
 static void _decorate_item_set(Elm_Gen_Item *);
 
@@ -1202,9 +1202,9 @@ _decorate_all_item_realize(Elm_Gen_Item *it,
 //-- tree expand/contract signal handle routine --//
 static void
 _expand_toggle_signal_cb(void *data,
-                         Evas_Object *obj __UNUSED__,
-                         const char *emission __UNUSED__,
-                         const char *source __UNUSED__)
+                         Evas_Object *obj EINA_UNUSED,
+                         const char *emission EINA_UNUSED,
+                         const char *source EINA_UNUSED)
 {
    Elm_Gen_Item *it = data;
 
@@ -1216,9 +1216,9 @@ _expand_toggle_signal_cb(void *data,
 
 static void
 _expand_signal_cb(void *data,
-                  Evas_Object *obj __UNUSED__,
-                  const char *emission __UNUSED__,
-                  const char *source __UNUSED__)
+                  Evas_Object *obj EINA_UNUSED,
+                  const char *emission EINA_UNUSED,
+                  const char *source EINA_UNUSED)
 {
    Elm_Gen_Item *it = data;
 
@@ -1228,9 +1228,9 @@ _expand_signal_cb(void *data,
 
 static void
 _contract_signal_cb(void *data,
-                    Evas_Object *obj __UNUSED__,
-                    const char *emission __UNUSED__,
-                    const char *source __UNUSED__)
+                    Evas_Object *obj EINA_UNUSED,
+                    const char *emission EINA_UNUSED,
+                    const char *source EINA_UNUSED)
 {
    Elm_Gen_Item *it = data;
 
@@ -1417,7 +1417,7 @@ _item_content_realize(Elm_Gen_Item *it,
 }
 
 static char *
-_access_info_cb(void *data, Evas_Object *obj __UNUSED__)
+_access_info_cb(void *data, Evas_Object *obj EINA_UNUSED)
 {
    char *ret;
    Eina_Strbuf *buf;
@@ -1455,7 +1455,7 @@ _access_info_cb(void *data, Evas_Object *obj __UNUSED__)
 }
 
 static char *
-_access_state_cb(void *data, Evas_Object *obj __UNUSED__)
+_access_state_cb(void *data, Evas_Object *obj EINA_UNUSED)
 {
    Elm_Gen_Item *it = (Elm_Gen_Item *)data;
    ELM_GENLIST_ITEM_CHECK_OR_RETURN(it, NULL);
@@ -3170,7 +3170,7 @@ _item_unselect(Elm_Gen_Item *it)
 
 static void
 _item_mouse_move_cb(void *data,
-                    Evas *evas __UNUSED__,
+                    Evas *evas EINA_UNUSED,
                     Evas_Object *obj,
                     void *event_info)
 {
@@ -3473,8 +3473,8 @@ _multi_touch_gesture_eval(Elm_Gen_Item *it)
 
 static void
 _item_multi_down_cb(void *data,
-                    Evas *evas __UNUSED__,
-                    Evas_Object *obj __UNUSED__,
+                    Evas *evas EINA_UNUSED,
+                    Evas_Object *obj EINA_UNUSED,
                     void *event_info)
 {
    Elm_Gen_Item *it = data;
@@ -3511,8 +3511,8 @@ _item_multi_down_cb(void *data,
 
 static void
 _item_multi_up_cb(void *data,
-                  Evas *evas __UNUSED__,
-                  Evas_Object *obj __UNUSED__,
+                  Evas *evas EINA_UNUSED,
+                  Evas_Object *obj EINA_UNUSED,
                   void *event_info)
 {
    Elm_Gen_Item *it = data;
@@ -3528,8 +3528,8 @@ _item_multi_up_cb(void *data,
 
 static void
 _item_multi_move_cb(void *data,
-                    Evas *evas __UNUSED__,
-                    Evas_Object *obj __UNUSED__,
+                    Evas *evas EINA_UNUSED,
+                    Evas_Object *obj EINA_UNUSED,
                     void *event_info)
 {
    Elm_Gen_Item *it = data;
@@ -3543,7 +3543,7 @@ _item_multi_move_cb(void *data,
 
 static void
 _item_mouse_down_cb(void *data,
-                    Evas *evas __UNUSED__,
+                    Evas *evas EINA_UNUSED,
                     Evas_Object *obj,
                     void *event_info)
 {
@@ -4073,8 +4073,8 @@ _item_move_after(Elm_Gen_Item *it,
 }
 
 static void
-_access_activate_cb(void *data __UNUSED__,
-                    Evas_Object *part_obj __UNUSED__,
+_access_activate_cb(void *data EINA_UNUSED,
+                    Evas_Object *part_obj EINA_UNUSED,
                     Elm_Object_Item *item)
 {
    Elm_Gen_Item *it = (Elm_Gen_Item *)item;
@@ -4147,8 +4147,8 @@ _item_move_before(Elm_Gen_Item *it,
 
 static void
 _item_mouse_up_cb(void *data,
-                  Evas *evas __UNUSED__,
-                  Evas_Object *obj __UNUSED__,
+                  Evas *evas EINA_UNUSED,
+                  Evas_Object *obj EINA_UNUSED,
                   void *event_info)
 {
    Evas_Event_Mouse_Up *ev = event_info;
@@ -4352,8 +4352,8 @@ _decorate_item_unrealize(Elm_Gen_Item *it)
 static void
 _decorate_item_finished_signal_cb(void *data,
                                   Evas_Object *obj,
-                                  const char *emission __UNUSED__,
-                                  const char *source __UNUSED__)
+                                  const char *emission EINA_UNUSED,
+                                  const char *source EINA_UNUSED)
 {
    Elm_Gen_Item *it = data;
    char buf[1024];
@@ -4665,98 +4665,98 @@ _update_job(void *data)
 
 static void
 _scroll_animate_start_cb(Evas_Object *obj,
-                         void *data __UNUSED__)
+                         void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call(obj, SIG_SCROLL_ANIM_START, NULL);
 }
 
 static void
 _scroll_animate_stop_cb(Evas_Object *obj,
-                        void *data __UNUSED__)
+                        void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call(obj, SIG_SCROLL_ANIM_STOP, NULL);
 }
 
 static void
 _scroll_drag_start_cb(Evas_Object *obj,
-                      void *data __UNUSED__)
+                      void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call(obj, SIG_SCROLL_DRAG_START, NULL);
 }
 
 static void
 _scroll_drag_stop_cb(Evas_Object *obj,
-                     void *data __UNUSED__)
+                     void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call(obj, SIG_SCROLL_DRAG_STOP, NULL);
 }
 
 static void
 _edge_left_cb(Evas_Object *obj,
-              void *data __UNUSED__)
+              void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call(obj, SIG_EDGE_LEFT, NULL);
 }
 
 static void
 _edge_right_cb(Evas_Object *obj,
-               void *data __UNUSED__)
+               void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call(obj, SIG_EDGE_RIGHT, NULL);
 }
 
 static void
 _edge_top_cb(Evas_Object *obj,
-             void *data __UNUSED__)
+             void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call(obj, SIG_EDGE_TOP, NULL);
 }
 
 static void
 _edge_bottom_cb(Evas_Object *obj,
-                void *data __UNUSED__)
+                void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call(obj, SIG_EDGE_BOTTOM, NULL);
 }
 
 static void
 _vbar_drag_cb(Evas_Object *obj,
-                void *data __UNUSED__)
+                void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call(obj, SIG_VBAR_DRAG, NULL);
 }
 
 static void
 _vbar_press_cb(Evas_Object *obj,
-                void *data __UNUSED__)
+                void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call(obj, SIG_VBAR_PRESS, NULL);
 }
 
 static void
 _vbar_unpress_cb(Evas_Object *obj,
-                void *data __UNUSED__)
+                void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call(obj, SIG_VBAR_UNPRESS, NULL);
 }
 
 static void
 _hbar_drag_cb(Evas_Object *obj,
-                void *data __UNUSED__)
+                void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call(obj, SIG_HBAR_DRAG, NULL);
 }
 
 static void
 _hbar_press_cb(Evas_Object *obj,
-                void *data __UNUSED__)
+                void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call(obj, SIG_HBAR_PRESS, NULL);
 }
 
 static void
 _hbar_unpress_cb(Evas_Object *obj,
-                void *data __UNUSED__)
+                void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call(obj, SIG_HBAR_UNPRESS, NULL);
 }
@@ -6597,9 +6597,9 @@ elm_genlist_item_item_class_get(const Elm_Object_Item *item)
 
 static Evas_Object *
 _elm_genlist_item_label_create(void *data,
-                               Evas_Object *obj __UNUSED__,
+                               Evas_Object *obj EINA_UNUSED,
                                Evas_Object *tooltip,
-                               void *it __UNUSED__)
+                               void *it EINA_UNUSED)
 {
    Evas_Object *label = elm_label_add(tooltip);
 
@@ -6614,8 +6614,8 @@ _elm_genlist_item_label_create(void *data,
 
 static void
 _elm_genlist_item_label_del_cb(void *data,
-                               Evas_Object *obj __UNUSED__,
-                               void *event_info __UNUSED__)
+                               Evas_Object *obj EINA_UNUSED,
+                               void *event_info EINA_UNUSED)
 {
    eina_stringshare_del(data);
 }

legacy/elementary/src/lib/elm_gesture_layer.c

@@ -713,7 +713,7 @@ _states_reset(Elm_Gesture_Layer_Smart_Data *sd)
  * @ingroup Elm_Gesture_Layer
  */
 static Eina_Bool
-_pointer_event_make(void *data __UNUSED__,
+_pointer_event_make(void *data EINA_UNUSED,
                     void *event_info,
                     Evas_Callback_Type event_type,
                     Pointer_Event *pe)
@@ -860,8 +860,8 @@ _event_history_add(Evas_Object *obj,
  */
 static void
 _mouse_down_cb(void *data,
-               Evas *e __UNUSED__,
-               Evas_Object *obj __UNUSED__,
+               Evas *e EINA_UNUSED,
+               Evas_Object *obj EINA_UNUSED,
                void *event_info)
 {
    if (((Evas_Event_Mouse_Down *)event_info)->button != 1)
@@ -872,8 +872,8 @@ _mouse_down_cb(void *data,
 
 static void
 _mouse_move_cb(void *data,
-               Evas *e __UNUSED__,
-               Evas_Object *obj __UNUSED__,
+               Evas *e EINA_UNUSED,
+               Evas_Object *obj EINA_UNUSED,
                void *event_info)
 {
    _event_process(data, obj, event_info, EVAS_CALLBACK_MOUSE_MOVE);
@@ -881,8 +881,8 @@ _mouse_move_cb(void *data,
 
 static void
 _key_down_cb(void *data,
-             Evas *e __UNUSED__,
-             Evas_Object *obj __UNUSED__,
+             Evas *e EINA_UNUSED,
+             Evas_Object *obj EINA_UNUSED,
              void *event_info)
 {
    _event_process(data, obj, event_info, EVAS_CALLBACK_KEY_DOWN);
@@ -890,8 +890,8 @@ _key_down_cb(void *data,
 
 static void
 _key_up_cb(void *data,
-           Evas *e __UNUSED__,
-           Evas_Object *obj __UNUSED__,
+           Evas *e EINA_UNUSED,
+           Evas_Object *obj EINA_UNUSED,
            void *event_info)
 {
    _event_process(data, obj, event_info, EVAS_CALLBACK_KEY_UP);
@@ -899,8 +899,8 @@ _key_up_cb(void *data,
 
 static void
 _mouse_up_cb(void *data,
-             Evas *e __UNUSED__,
-             Evas_Object *obj __UNUSED__,
+             Evas *e EINA_UNUSED,
+             Evas_Object *obj EINA_UNUSED,
              void *event_info)
 {
    if (((Evas_Event_Mouse_Up *)event_info)->button != 1)
@@ -911,8 +911,8 @@ _mouse_up_cb(void *data,
 
 static void
 _mouse_wheel_cb(void *data,
-                Evas *e __UNUSED__,
-                Evas_Object *obj __UNUSED__,
+                Evas *e EINA_UNUSED,
+                Evas_Object *obj EINA_UNUSED,
                 void *event_info)
 {
    _event_process(data, obj, event_info, EVAS_CALLBACK_MOUSE_WHEEL);
@@ -920,8 +920,8 @@ _mouse_wheel_cb(void *data,
 
 static void
 _multi_down_cb(void *data,
-               Evas *e __UNUSED__,
-               Evas_Object *obj __UNUSED__,
+               Evas *e EINA_UNUSED,
+               Evas_Object *obj EINA_UNUSED,
                void *event_info)
 {
    /* Skip the mouse duplicates. */
@@ -932,8 +932,8 @@ _multi_down_cb(void *data,
 
 static void
 _multi_move_cb(void *data,
-               Evas *e __UNUSED__,
-               Evas_Object *obj __UNUSED__,
+               Evas *e EINA_UNUSED,
+               Evas_Object *obj EINA_UNUSED,
                void *event_info)
 {
    /* Skip the mouse duplicates. */
@@ -944,8 +944,8 @@ _multi_move_cb(void *data,
 
 static void
 _multi_up_cb(void *data,
-             Evas *e __UNUSED__,
-             Evas_Object *obj __UNUSED__,
+             Evas *e EINA_UNUSED,
+             Evas_Object *obj EINA_UNUSED,
              void *event_info)
 {
    /* Skip the mouse duplicates. */
@@ -956,9 +956,9 @@ _multi_up_cb(void *data,
 
 static void
 _target_del_cb(void *data,
-               Evas *e __UNUSED__,
-               Evas_Object *obj __UNUSED__,
-               void *event_info __UNUSED__)
+               Evas *e EINA_UNUSED,
+               Evas_Object *obj EINA_UNUSED,
+               void *event_info EINA_UNUSED)
 {
    _callbacks_unregister(data);
    ELM_GESTURE_LAYER_DATA_GET(data, sd);
@@ -1338,7 +1338,7 @@ _continues_gestures_restart(void *data,
  */
 static void
 _event_process(void *data,
-               Evas_Object *obj __UNUSED__,
+               Evas_Object *obj EINA_UNUSED,
                void *event_info,
                Evas_Callback_Type event_type)
 {

legacy/elementary/src/lib/elm_hover.c

@@ -62,44 +62,44 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
 
 static void
 _parent_move_cb(void *data,
-                Evas *e __UNUSED__,
-                Evas_Object *obj __UNUSED__,
-                void *event_info __UNUSED__)
+                Evas *e EINA_UNUSED,
+                Evas_Object *obj EINA_UNUSED,
+                void *event_info EINA_UNUSED)
 {
    elm_layout_sizing_eval(data);
 }
 
 static void
 _parent_resize_cb(void *data,
-                  Evas *e __UNUSED__,
-                  Evas_Object *obj __UNUSED__,
-                  void *event_info __UNUSED__)
+                  Evas *e EINA_UNUSED,
+                  Evas_Object *obj EINA_UNUSED,
+                  void *event_info EINA_UNUSED)
 {
    elm_layout_sizing_eval(data);
 }
 
 static void
-_parent_show_cb(void *data __UNUSED__,
-                Evas *e __UNUSED__,
-                Evas_Object *obj __UNUSED__,
-                void *event_info __UNUSED__)
+_parent_show_cb(void *data EINA_UNUSED,
+                Evas *e EINA_UNUSED,
+                Evas_Object *obj EINA_UNUSED,
+                void *event_info EINA_UNUSED)
 {
 }
 
 static void
 _parent_hide_cb(void *data,
-                Evas *e __UNUSED__,
-                Evas_Object *obj __UNUSED__,
-                void *event_info __UNUSED__)
+                Evas *e EINA_UNUSED,
+                Evas_Object *obj EINA_UNUSED,
+                void *event_info EINA_UNUSED)
 {
    evas_object_hide(data);
 }
 
 static void
 _parent_del_cb(void *data,
-               Evas *e __UNUSED__,
-               Evas_Object *obj __UNUSED__,
-               void *event_info __UNUSED__)
+               Evas *e EINA_UNUSED,
+               Evas_Object *obj EINA_UNUSED,
+               void *event_info EINA_UNUSED)
 {
    elm_hover_parent_set(data, NULL);
    elm_layout_sizing_eval(data);
@@ -328,9 +328,9 @@ _elm_hover_smart_sizing_eval(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 
 static void
 _on_smt_sub_changed(void *data,
-                    Evas *e __UNUSED__,
-                    Evas_Object *obj __UNUSED__,
-                    void *event_info __UNUSED__)
+                    Evas *e EINA_UNUSED,
+                    Evas_Object *obj EINA_UNUSED,
+                    void *event_info EINA_UNUSED)
 {
    _elm_hover_smt_sub_re_eval(data);
 }
@@ -509,9 +509,9 @@ _elm_hover_smart_content_unset(Eo *obj, void *_pd, va_list *list)
 
 static void
 _target_del_cb(void *data,
-               Evas *e __UNUSED__,
-               Evas_Object *obj __UNUSED__,
-               void *event_info __UNUSED__)
+               Evas *e EINA_UNUSED,
+               Evas_Object *obj EINA_UNUSED,
+               void *event_info EINA_UNUSED)
 {
    ELM_HOVER_DATA_GET(data, sd);
 
@@ -520,9 +520,9 @@ _target_del_cb(void *data,
 
 static void
 _target_move_cb(void *data,
-                Evas *e __UNUSED__,
-                Evas_Object *obj __UNUSED__,
-                void *event_info __UNUSED__)
+                Evas *e EINA_UNUSED,
+                Evas_Object *obj EINA_UNUSED,
+                void *event_info EINA_UNUSED)
 {
    elm_layout_sizing_eval(data);
    _elm_hover_smt_sub_re_eval(data);
@@ -530,9 +530,9 @@ _target_move_cb(void *data,
 
 static void
 _hov_dismiss_cb(void *data,
-                Evas_Object *obj __UNUSED__,
-                const char *emission __UNUSED__,
-                const char *source __UNUSED__)
+                Evas_Object *obj EINA_UNUSED,
+                const char *emission EINA_UNUSED,
+                const char *source EINA_UNUSED)
 {
    evas_object_hide(data);
    evas_object_smart_callback_call(data, SIG_CLICKED, NULL);

legacy/elementary/src/lib/elm_icon.c

@@ -249,8 +249,8 @@ _icon_thumb_apply(Elm_Icon_Smart_Data *sd)
 
 static Eina_Bool
 _icon_thumb_apply_cb(void *data,
-                     int type __UNUSED__,
-                     void *ev __UNUSED__)
+                     int type EINA_UNUSED,
+                     void *ev EINA_UNUSED)
 {
    ELM_ICON_DATA_GET(data, sd);
 
@@ -547,9 +547,9 @@ _elm_icon_standard_set(Evas_Object *obj,
 
 static void
 _elm_icon_standard_resize_cb(void *data,
-                             Evas *e __UNUSED__,
+                             Evas *e EINA_UNUSED,
                              Evas_Object *obj,
-                             void *event_info __UNUSED__)
+                             void *event_info EINA_UNUSED)
 {
    ELM_ICON_DATA_GET(data, sd);
    const char *refup = eina_stringshare_ref(sd->stdicon);
@@ -563,9 +563,9 @@ _elm_icon_standard_resize_cb(void *data,
 
 static void
 _elm_icon_thumb_resize_cb(void *data,
-                          Evas *e __UNUSED__,
+                          Evas *e EINA_UNUSED,
                           Evas_Object *obj,
-                          void *event_info __UNUSED__)
+                          void *event_info EINA_UNUSED)
 {
    ELM_ICON_DATA_GET(data, sd);
 
@@ -628,7 +628,7 @@ _elm_icon_signal_emit(Evas_Object *obj,
 
 static void
 _edje_signal_callback(void *data,
-                      Evas_Object *obj __UNUSED__,
+                      Evas_Object *obj EINA_UNUSED,
                       const char *emission,
                       const char *source)
 {

legacy/elementary/src/lib/elm_image.c

@@ -39,9 +39,9 @@ _activate(Evas_Object *obj)
 
 static void
 _on_image_preloaded(void *data,
-                    Evas *e __UNUSED__,
+                    Evas *e EINA_UNUSED,
                     Evas_Object *obj,
-                    void *event __UNUSED__)
+                    void *event EINA_UNUSED)
 {
    Elm_Image_Smart_Data *sd = data;
    sd->preloading = EINA_FALSE;
@@ -51,8 +51,8 @@ _on_image_preloaded(void *data,
 
 static void
 _on_mouse_up(void *data,
-             Evas *e __UNUSED__,
-             Evas_Object *obj __UNUSED__,
+             Evas *e EINA_UNUSED,
+             Evas_Object *obj EINA_UNUSED,
              void *event_info)
 {
    Evas_Event_Mouse_Up *ev = event_info;

legacy/elementary/src/lib/elm_index.c

@@ -103,7 +103,7 @@ _access_index_register(Evas_Object *obj)
 }
 
 static char *
-_access_info_cb(void *data, Evas_Object *obj __UNUSED__)
+_access_info_cb(void *data, Evas_Object *obj EINA_UNUSED)
 {
    const char *txt = NULL;
 
@@ -687,8 +687,8 @@ _sel_eval(Evas_Object *obj,
 
 static void
 _on_mouse_down(void *data,
-               Evas *e __UNUSED__,
-               Evas_Object *o __UNUSED__,
+               Evas *e EINA_UNUSED,
+               Evas_Object *o EINA_UNUSED,
                void *event_info)
 {
    Evas_Event_Mouse_Down *ev = event_info;
@@ -717,8 +717,8 @@ _on_mouse_down(void *data,
 
 static void
 _on_mouse_up(void *data,
-             Evas *e __UNUSED__,
-             Evas_Object *o __UNUSED__,
+             Evas *e EINA_UNUSED,
+             Evas_Object *o EINA_UNUSED,
              void *event_info)
 {
    Evas_Event_Mouse_Up *ev = event_info;
@@ -747,8 +747,8 @@ _on_mouse_up(void *data,
 
 static void
 _on_mouse_move(void *data,
-               Evas *e __UNUSED__,
-               Evas_Object *o __UNUSED__,
+               Evas *e EINA_UNUSED,
+               Evas_Object *o EINA_UNUSED,
                void *event_info)
 {
    Evas_Event_Mouse_Move *ev = event_info;
@@ -798,9 +798,9 @@ _on_mouse_move(void *data,
 
 static void
 _on_mouse_in_access(void *data,
-                    Evas *e __UNUSED__,
-                    Evas_Object *o __UNUSED__,
-                    void *event_info __UNUSED__)
+                    Evas *e EINA_UNUSED,
+                    Evas_Object *o EINA_UNUSED,
+                    void *event_info EINA_UNUSED)
 {
    ELM_INDEX_DATA_GET(data, sd);
 
@@ -815,8 +815,8 @@ _on_mouse_in_access(void *data,
 
 static void
 _on_mouse_move_access(void *data,
-                      Evas *e __UNUSED__,
-                      Evas_Object *o __UNUSED__,
+                      Evas *e EINA_UNUSED,
+                      Evas_Object *o EINA_UNUSED,
                       void *event_info)
 {
 
@@ -852,9 +852,9 @@ _on_mouse_move_access(void *data,
 
 static void
 _on_mouse_out_access(void *data,
-                      Evas *e __UNUSED__,
-                      Evas_Object *o __UNUSED__,
-                      void *event_info __UNUSED__)
+                      Evas *e EINA_UNUSED,
+                      Evas_Object *o EINA_UNUSED,
+                      void *event_info EINA_UNUSED)
 {
    ELM_INDEX_DATA_GET(data, sd);
 
@@ -863,10 +863,10 @@ _on_mouse_out_access(void *data,
 }
 
 static void
-_index_resize_cb(void *data __UNUSED__,
-                 Evas *e __UNUSED__,
+_index_resize_cb(void *data EINA_UNUSED,
+                 Evas *e EINA_UNUSED,
                  Evas_Object *obj,
-                 void *event_info __UNUSED__)
+                 void *event_info EINA_UNUSED)
 {
    ELM_INDEX_DATA_GET_OR_RETURN(obj, sd);
 
@@ -1674,7 +1674,7 @@ elm_index_delay_change_time_set(Evas_Object *obj, double delay_change_time)
 }
 
 static void
-_delay_change_time_set(Eo *obj __UNUSED__, void *_pd, va_list *list)
+_delay_change_time_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 {
    double dtime = va_arg(*list, double);
    Elm_Index_Smart_Data *sd = _pd;
@@ -1691,7 +1691,7 @@ elm_index_delay_change_time_get(const Evas_Object *obj)
 }
 
 static void
-_delay_change_time_get(Eo *obj __UNUSED__, void *_pd, va_list *list)
+_delay_change_time_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 {
    double *ret = va_arg(*list, double *);
    Elm_Index_Smart_Data *sd = _pd;
@@ -1737,7 +1737,7 @@ elm_index_omit_enabled_get(const Evas_Object *obj)
 }
 
 static void
-_omit_enabled_get(Eo *obj __UNUSED__, void *_pd, va_list *list)
+_omit_enabled_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 {
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
    Elm_Index_Smart_Data *sd = _pd;

legacy/elementary/src/lib/elm_interface_scrollable.c

@@ -255,9 +255,9 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
 
 static void
 _elm_pan_content_del_cb(void *data,
-                        Evas *e __UNUSED__,
-                        Evas_Object *obj __UNUSED__,
-                        void *event_info __UNUSED__)
+                        Evas *e EINA_UNUSED,
+                        Evas_Object *obj EINA_UNUSED,
+                        void *event_info EINA_UNUSED)
 {
    Elm_Pan_Smart_Data *psd;
 
@@ -270,9 +270,9 @@ _elm_pan_content_del_cb(void *data,
 
 static void
 _elm_pan_content_resize_cb(void *data,
-                           Evas *e __UNUSED__,
-                           Evas_Object *obj __UNUSED__,
-                           void *event_info __UNUSED__)
+                           Evas *e EINA_UNUSED,
+                           Evas_Object *obj EINA_UNUSED,
+                           void *event_info EINA_UNUSED)
 {
    Elm_Pan_Smart_Data *psd;
    Evas_Coord w, h;
@@ -1045,9 +1045,9 @@ _elm_scroll_policy_signal_emit(Elm_Scrollable_Smart_Interface_Data *sid)
 
 static void
 _elm_scroll_reload_cb(void *data,
-                      Evas_Object *obj __UNUSED__,
-                      const char *emission __UNUSED__,
-                      const char *source __UNUSED__)
+                      Evas_Object *obj EINA_UNUSED,
+                      const char *emission EINA_UNUSED,
+                      const char *source EINA_UNUSED)
 {
    Elm_Scrollable_Smart_Interface_Data *sid = data;
    _elm_scroll_policy_signal_emit(sid);
@@ -1055,9 +1055,9 @@ _elm_scroll_reload_cb(void *data,
 
 static void
 _elm_scroll_vbar_drag_cb(void *data,
-                         Evas_Object *obj __UNUSED__,
-                         const char *emission __UNUSED__,
-                         const char *source __UNUSED__)
+                         Evas_Object *obj EINA_UNUSED,
+                         const char *emission EINA_UNUSED,
+                         const char *source EINA_UNUSED)
 {
    Elm_Scrollable_Smart_Interface_Data *sid = data;
 
@@ -1069,9 +1069,9 @@ _elm_scroll_vbar_drag_cb(void *data,
 
 static void
 _elm_scroll_vbar_press_cb(void *data,
-                          Evas_Object *obj __UNUSED__,
-                          const char *emission __UNUSED__,
-                          const char *source __UNUSED__)
+                          Evas_Object *obj EINA_UNUSED,
+                          const char *emission EINA_UNUSED,
+                          const char *source EINA_UNUSED)
 {
    Elm_Scrollable_Smart_Interface_Data *sid = data;
 
@@ -1081,9 +1081,9 @@ _elm_scroll_vbar_press_cb(void *data,
 
 static void
 _elm_scroll_vbar_unpress_cb(void *data,
-                            Evas_Object *obj __UNUSED__,
-                            const char *emission __UNUSED__,
-                            const char *source __UNUSED__)
+                            Evas_Object *obj EINA_UNUSED,
+                            const char *emission EINA_UNUSED,
+                            const char *source EINA_UNUSED)
 {
    Elm_Scrollable_Smart_Interface_Data *sid = data;
 
@@ -1093,9 +1093,9 @@ _elm_scroll_vbar_unpress_cb(void *data,
 
 static void
 _elm_scroll_edje_drag_v_start_cb(void *data,
-                                 Evas_Object *obj __UNUSED__,
-                                 const char *emission __UNUSED__,
-                                 const char *source __UNUSED__)
+                                 Evas_Object *obj EINA_UNUSED,
+                                 const char *emission EINA_UNUSED,
+                                 const char *source EINA_UNUSED)
 {
    Elm_Scrollable_Smart_Interface_Data *sid = data;
 
@@ -1106,9 +1106,9 @@ _elm_scroll_edje_drag_v_start_cb(void *data,
 
 static void
 _elm_scroll_edje_drag_v_stop_cb(void *data,
-                                Evas_Object *obj __UNUSED__,
-                                const char *emission __UNUSED__,
-                                const char *source __UNUSED__)
+                                Evas_Object *obj EINA_UNUSED,
+                                const char *emission EINA_UNUSED,
+                                const char *source EINA_UNUSED)
 {
    Elm_Scrollable_Smart_Interface_Data *sid = data;
 
@@ -1119,9 +1119,9 @@ _elm_scroll_edje_drag_v_stop_cb(void *data,
 
 static void
 _elm_scroll_edje_drag_v_cb(void *data,
-                           Evas_Object *obj __UNUSED__,
-                           const char *emission __UNUSED__,
-                           const char *source __UNUSED__)
+                           Evas_Object *obj EINA_UNUSED,
+                           const char *emission EINA_UNUSED,
+                           const char *source EINA_UNUSED)
 {
    Elm_Scrollable_Smart_Interface_Data *sid = data;
 
@@ -1130,9 +1130,9 @@ _elm_scroll_edje_drag_v_cb(void *data,
 
 static void
 _elm_scroll_hbar_drag_cb(void *data,
-                         Evas_Object *obj __UNUSED__,
-                         const char *emission __UNUSED__,
-                         const char *source __UNUSED__)
+                         Evas_Object *obj EINA_UNUSED,
+                         const char *emission EINA_UNUSED,
+                         const char *source EINA_UNUSED)
 {
    Elm_Scrollable_Smart_Interface_Data *sid = data;
 
@@ -1144,9 +1144,9 @@ _elm_scroll_hbar_drag_cb(void *data,
 
 static void
 _elm_scroll_hbar_press_cb(void *data,
-                          Evas_Object *obj __UNUSED__,
-                          const char *emission __UNUSED__,
-                          const char *source __UNUSED__)
+                          Evas_Object *obj EINA_UNUSED,
+                          const char *emission EINA_UNUSED,
+                          const char *source EINA_UNUSED)
 {
    Elm_Scrollable_Smart_Interface_Data *sid = data;
 
@@ -1156,9 +1156,9 @@ _elm_scroll_hbar_press_cb(void *data,
 
 static void
 _elm_scroll_hbar_unpress_cb(void *data,
-                            Evas_Object *obj __UNUSED__,
-                            const char *emission __UNUSED__,
-                            const char *source __UNUSED__)
+                            Evas_Object *obj EINA_UNUSED,
+                            const char *emission EINA_UNUSED,
+                            const char *source EINA_UNUSED)
 {
    Elm_Scrollable_Smart_Interface_Data *sid = data;
 
@@ -1168,9 +1168,9 @@ _elm_scroll_hbar_unpress_cb(void *data,
 
 static void
 _elm_scroll_edje_drag_h_start_cb(void *data,
-                                 Evas_Object *obj __UNUSED__,
-                                 const char *emission __UNUSED__,
-                                 const char *source __UNUSED__)
+                                 Evas_Object *obj EINA_UNUSED,
+                                 const char *emission EINA_UNUSED,
+                                 const char *source EINA_UNUSED)
 {
    Elm_Scrollable_Smart_Interface_Data *sid = data;
 
@@ -1181,9 +1181,9 @@ _elm_scroll_edje_drag_h_start_cb(void *data,
 
 static void
 _elm_scroll_edje_drag_h_stop_cb(void *data,
-                                Evas_Object *obj __UNUSED__,
-                                const char *emission __UNUSED__,
-                                const char *source __UNUSED__)
+                                Evas_Object *obj EINA_UNUSED,
+                                const char *emission EINA_UNUSED,
+                                const char *source EINA_UNUSED)
 {
    Elm_Scrollable_Smart_Interface_Data *sid = data;
 
@@ -1194,9 +1194,9 @@ _elm_scroll_edje_drag_h_stop_cb(void *data,
 
 static void
 _elm_scroll_edje_drag_h_cb(void *data,
-                           Evas_Object *obj __UNUSED__,
-                           const char *emission __UNUSED__,
-                           const char *source __UNUSED__)
+                           Evas_Object *obj EINA_UNUSED,
+                           const char *emission EINA_UNUSED,
+                           const char *source EINA_UNUSED)
 {
    Elm_Scrollable_Smart_Interface_Data *sid = data;
 
@@ -1916,8 +1916,8 @@ _elm_scroll_wanted_region_set(Evas_Object *obj)
 
 static void
 _elm_scroll_wheel_event_cb(void *data,
-                           Evas *e __UNUSED__,
-                           Evas_Object *obj __UNUSED__,
+                           Evas *e EINA_UNUSED,
+                           Evas_Object *obj EINA_UNUSED,
                            void *event_info)
 {
    Elm_Scrollable_Smart_Interface_Data *sid;
@@ -1990,7 +1990,7 @@ _elm_scroll_wheel_event_cb(void *data,
 
 static Eina_Bool
 _elm_scroll_post_event_up(void *data,
-                          Evas *e __UNUSED__)
+                          Evas *e EINA_UNUSED)
 {
    Elm_Scrollable_Smart_Interface_Data *sid = data;
 
@@ -2346,7 +2346,7 @@ _elm_scroll_scroll_to_x(Elm_Scrollable_Smart_Interface_Data *sid,
 static void
 _elm_scroll_mouse_up_event_cb(void *data,
                               Evas *e,
-                              Evas_Object *obj __UNUSED__,
+                              Evas_Object *obj EINA_UNUSED,
                               void *event_info)
 {
    Elm_Scrollable_Smart_Interface_Data *sid = data;
@@ -2637,8 +2637,8 @@ _elm_scroll_mouse_up_event_cb(void *data,
 
 static void
 _elm_scroll_mouse_down_event_cb(void *data,
-                                Evas *e __UNUSED__,
-                                Evas_Object *obj __UNUSED__,
+                                Evas *e EINA_UNUSED,
+                                Evas_Object *obj EINA_UNUSED,
                                 void *event_info)
 {
    Elm_Scrollable_Smart_Interface_Data *sid;
@@ -2782,7 +2782,7 @@ _elm_scroll_can_scroll(Elm_Scrollable_Smart_Interface_Data *sid,
 
 static Eina_Bool
 _elm_scroll_post_event_move(void *data,
-                            Evas *e __UNUSED__)
+                            Evas *e EINA_UNUSED)
 {
    Elm_Scrollable_Smart_Interface_Data *sid = data;
    Eina_Bool horiz, vert;
@@ -3070,7 +3070,7 @@ _elm_scroll_on_hold_animator(void *data)
 static void
 _elm_scroll_mouse_move_event_cb(void *data,
                                 Evas *e,
-                                Evas_Object *obj __UNUSED__,
+                                Evas_Object *obj EINA_UNUSED,
                                 void *event_info)
 {
    Elm_Scrollable_Smart_Interface_Data *sid = data;
@@ -3419,9 +3419,9 @@ _elm_scroll_reconfigure(Elm_Scrollable_Smart_Interface_Data *sid)
 
 static void
 _on_edje_move(void *data,
-              Evas *e __UNUSED__,
+              Evas *e EINA_UNUSED,
               Evas_Object *edje_obj,
-              void *event_info __UNUSED__)
+              void *event_info EINA_UNUSED)
 {
    Elm_Scrollable_Smart_Interface_Data *sid = data;
    int x, y;
@@ -3436,9 +3436,9 @@ _on_edje_move(void *data,
 
 static void
 _on_edje_resize(void *data,
-                Evas *e __UNUSED__,
+                Evas *e EINA_UNUSED,
                 Evas_Object *edje_obj,
-                void *event_info __UNUSED__)
+                void *event_info EINA_UNUSED)
 {
    Elm_Scrollable_Smart_Interface_Data *sid = data;
    int w, h;
@@ -3691,9 +3691,9 @@ _elm_scroll_scroll_bar_reset(Elm_Scrollable_Smart_Interface_Data *sid)
 
 static void
 _elm_scroll_pan_resized_cb(void *data,
-                          Evas *e __UNUSED__,
-                          Evas_Object *obj __UNUSED__,
-                          void *event_info __UNUSED__)
+                          Evas *e EINA_UNUSED,
+                          Evas_Object *obj EINA_UNUSED,
+                          void *event_info EINA_UNUSED)
 {
    Evas_Coord w, h;
    Elm_Scrollable_Smart_Interface_Data *sid = data;
@@ -3709,8 +3709,8 @@ _elm_scroll_pan_resized_cb(void *data,
 /* even external pan objects get this */
 static void
 _elm_scroll_pan_changed_cb(void *data,
-                           Evas_Object *obj __UNUSED__,
-                           void *event_info __UNUSED__)
+                           Evas_Object *obj EINA_UNUSED,
+                           void *event_info EINA_UNUSED)
 {
    Evas_Coord w, h;
    Elm_Scrollable_Smart_Interface_Data *sid = data;
@@ -3733,9 +3733,9 @@ _elm_scroll_pan_changed_cb(void *data,
 
 static void
 _elm_scroll_content_del_cb(void *data,
-                           Evas *e __UNUSED__,
-                           Evas_Object *obj __UNUSED__,
-                           void *event_info __UNUSED__)
+                           Evas *e EINA_UNUSED,
+                           Evas_Object *obj EINA_UNUSED,
+                           void *event_info EINA_UNUSED)
 {
    Elm_Scrollable_Smart_Interface_Data *sid = data;
 
@@ -4540,7 +4540,7 @@ _elm_scroll_gravity_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *lis
 }
 
 static void
-_elm_scroll_movement_block_set(Eo *obj __UNUSED__, void *_pd, va_list *list)
+_elm_scroll_movement_block_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 {
    Elm_Scrollable_Smart_Interface_Data *sid = _pd;
 
@@ -4551,7 +4551,7 @@ _elm_scroll_movement_block_set(Eo *obj __UNUSED__, void *_pd, va_list *list)
 }
 
 static void
-_elm_scroll_movement_block_get(Eo *obj __UNUSED__, void *_pd, va_list *list)
+_elm_scroll_movement_block_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 {
    Elm_Scrollable_Smart_Interface_Data *sid = _pd;
    Elm_Scroller_Movement_Block *block = va_arg(*list,

legacy/elementary/src/lib/elm_label.c

@@ -210,9 +210,9 @@ _elm_label_smart_sizing_eval(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_
 
 static void
 _on_label_resize(void *data,
-                 Evas *e __UNUSED__,
-                 Evas_Object *obj __UNUSED__,
-                 void *event_info __UNUSED__)
+                 Evas *e EINA_UNUSED,
+                 Evas_Object *obj EINA_UNUSED,
+                 void *event_info EINA_UNUSED)
 {
    ELM_LABEL_DATA_GET(data, sd);
 
@@ -354,7 +354,7 @@ _elm_label_smart_translate(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 }
 
 static char *
-_access_info_cb(void *data __UNUSED__, Evas_Object *obj)
+_access_info_cb(void *data EINA_UNUSED, Evas_Object *obj)
 {
    const char *txt = elm_widget_access_info_get(obj);
 
@@ -365,8 +365,8 @@ _access_info_cb(void *data __UNUSED__, Evas_Object *obj)
 }
 
 static void
-_on_slide_end(void *data, Evas_Object *obj __UNUSED__,
-              const char *emission __UNUSED__, const char *source __UNUSED__)
+_on_slide_end(void *data, Evas_Object *obj EINA_UNUSED,
+              const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
 {
    ELM_LABEL_DATA_GET(data, sd);
 
@@ -615,7 +615,7 @@ elm_label_slide_mode_set(Evas_Object *obj, Elm_Label_Slide_Mode mode)
 }
 
 static void
-_slide_mode_set(Eo *obj __UNUSED__, void *_pd, va_list *list)
+_slide_mode_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 {
    Elm_Label_Slide_Mode mode = va_arg(*list, Elm_Label_Slide_Mode);
    Elm_Label_Smart_Data *sd = _pd;
@@ -632,7 +632,7 @@ elm_label_slide_mode_get(const Evas_Object *obj)
 }
 
 static void
-_slide_mode_get(Eo *obj __UNUSED__, void *_pd, va_list *list)
+_slide_mode_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 {
    Elm_Label_Slide_Mode *ret = va_arg(*list, Elm_Label_Slide_Mode *);
    Elm_Label_Smart_Data *sd = _pd;
@@ -666,7 +666,7 @@ elm_label_slide_duration_set(Evas_Object *obj, double duration)
 }
 
 static void
-_slide_duration_set(Eo *obj __UNUSED__, void *_pd, va_list *list)
+_slide_duration_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 {
    double duration = va_arg(*list, double);
    Elm_Label_Smart_Data *sd = _pd;
@@ -690,7 +690,7 @@ elm_label_slide_go(Evas_Object *obj)
 }
 
 static void
-_slide_go(Eo *obj, void *_pd __UNUSED__, va_list *list __UNUSED__)
+_slide_go(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
 {
    _label_slide_change(obj);
    elm_layout_sizing_eval(obj);

legacy/elementary/src/lib/elm_layout.c

@@ -80,9 +80,9 @@ _elm_layout_smart_translate(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 
 static void
 _on_sub_object_size_hint_change(void *data,
-                                Evas *e __UNUSED__,
-                                Evas_Object *obj __UNUSED__,
-                                void *event_info __UNUSED__)
+                                Evas *e EINA_UNUSED,
+                                Evas_Object *obj EINA_UNUSED,
+                                void *event_info EINA_UNUSED)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
    eo_do(data, elm_obj_layout_sizing_eval());
@@ -276,7 +276,7 @@ _parts_cursors_apply(Elm_Layout_Smart_Data *sd)
 
 static void
 _reload_theme(void *data, Evas_Object *obj,
-              const char *emission __UNUSED__, const char *source __UNUSED__)
+              const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
 {
    Evas_Object *layout = data;
    const char *file;
@@ -564,7 +564,7 @@ _elm_layout_smart_focus_direction(Eo *obj, void *_pd, va_list *list)
 
 static void
 _edje_signal_callback(void *data,
-                      Evas_Object *obj __UNUSED__,
+                      Evas_Object *obj EINA_UNUSED,
                       const char *emission,
                       const char *source)
 {
@@ -640,9 +640,9 @@ _elm_layout_part_aliasing_eval(const Evas_Object *obj EINA_UNUSED,
 
 static void
 _box_reference_del(void *data,
-                   Evas *e __UNUSED__,
-                   Evas_Object *obj __UNUSED__,
-                   void *event_info __UNUSED__)
+                   Evas *e EINA_UNUSED,
+                   Evas_Object *obj EINA_UNUSED,
+                   void *event_info EINA_UNUSED)
 {
    Elm_Layout_Sub_Object_Data *sub_d = data;
    sub_d->p.box.reference = NULL;
@@ -714,9 +714,9 @@ _sub_table_remove(Evas_Object *obj,
 
 static void
 _on_size_evaluate_signal(void *data,
-                         Evas_Object *obj __UNUSED__,
-                         const char *emission __UNUSED__,
-                         const char *source __UNUSED__)
+                         Evas_Object *obj EINA_UNUSED,
+                         const char *emission EINA_UNUSED,
+                         const char *source EINA_UNUSED)
 {
    eo_do(data, elm_obj_layout_sizing_eval());
 }

legacy/elementary/src/lib/elm_list.c

@@ -800,9 +800,9 @@ _items_fix(Evas_Object *obj)
 
 static void
 _size_hints_changed_cb(void *data,
-                       Evas *e __UNUSED__,
-                       Evas_Object *obj __UNUSED__,
-                       void *event_info __UNUSED__)
+                       Evas *e EINA_UNUSED,
+                       Evas_Object *obj EINA_UNUSED,
+                       void *event_info EINA_UNUSED)
 {
    ELM_LIST_DATA_GET(data, sd);
    if (sd->delete_me) return;
@@ -1097,28 +1097,28 @@ _swipe_cancel(void *data)
 
 static void
 _edge_left_cb(Evas_Object *obj,
-              void *data __UNUSED__)
+              void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call(obj, SIG_EDGE_LEFT, NULL);
 }
 
 static void
 _edge_right_cb(Evas_Object *obj,
-               void *data __UNUSED__)
+               void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call(obj, SIG_EDGE_RIGHT, NULL);
 }
 
 static void
 _edge_top_cb(Evas_Object *obj,
-             void *data __UNUSED__)
+             void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call(obj, SIG_EDGE_TOP, NULL);
 }
 
 static void
 _edge_bottom_cb(Evas_Object *obj,
-                void *data __UNUSED__)
+                void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call(obj, SIG_EDGE_BOTTOM, NULL);
 }
@@ -1166,8 +1166,8 @@ _swipe_do(Elm_List_Item *it)
 
 static void
 _mouse_move_cb(void *data,
-               Evas *evas __UNUSED__,
-               Evas_Object *o __UNUSED__,
+               Evas *evas EINA_UNUSED,
+               Evas_Object *o EINA_UNUSED,
                void *event_info)
 {
    Evas_Object *obj;
@@ -1211,8 +1211,8 @@ _mouse_move_cb(void *data,
 
 static void
 _mouse_down_cb(void *data,
-               Evas *evas __UNUSED__,
-               Evas_Object *o __UNUSED__,
+               Evas *evas EINA_UNUSED,
+               Evas_Object *o EINA_UNUSED,
                void *event_info)
 {
    Evas_Event_Mouse_Down *ev = event_info;
@@ -1256,8 +1256,8 @@ _mouse_down_cb(void *data,
 
 static void
 _mouse_up_cb(void *data,
-             Evas *evas __UNUSED__,
-             Evas_Object *o __UNUSED__,
+             Evas *evas EINA_UNUSED,
+             Evas_Object *o EINA_UNUSED,
              void *event_info)
 {
    Evas_Object *obj;
@@ -1525,7 +1525,7 @@ _item_signal_emit_hook(Elm_Object_Item *it,
 }
 
 static char *
-_access_info_cb(void *data, Evas_Object *obj __UNUSED__)
+_access_info_cb(void *data, Evas_Object *obj EINA_UNUSED)
 {
    Elm_List_Item *it = (Elm_List_Item *)data;
    const char *txt = NULL;
@@ -1538,7 +1538,7 @@ _access_info_cb(void *data, Evas_Object *obj __UNUSED__)
 }
 
 static char *
-_access_state_cb(void *data, Evas_Object *obj __UNUSED__)
+_access_state_cb(void *data, Evas_Object *obj EINA_UNUSED)
 {
    Elm_List_Item *it = (Elm_List_Item *)data;
    if (!it) return NULL;
@@ -1559,8 +1559,8 @@ _access_on_highlight_cb(void *data)
 }
 
 static void
-_access_activate_cb(void *data __UNUSED__,
-                    Evas_Object *part_obj __UNUSED__,
+_access_activate_cb(void *data EINA_UNUSED,
+                    Evas_Object *part_obj EINA_UNUSED,
                     Elm_Object_Item *item)
 {
    Elm_List_Item *it;
@@ -1706,9 +1706,9 @@ _item_new(Evas_Object *obj,
 
 static void
 _resize_cb(void *data,
-           Evas *e __UNUSED__,
-           Evas_Object *obj __UNUSED__,
-           void *event_info __UNUSED__)
+           Evas *e EINA_UNUSED,
+           Evas_Object *obj EINA_UNUSED,
+           void *event_info EINA_UNUSED)
 {
    elm_layout_sizing_eval(data);
 }

legacy/elementary/src/lib/elm_main.c

@@ -74,9 +74,9 @@ static Ecore_Event_Handler *_elm_exit_handler = NULL;
 static Eina_Bool quicklaunch_on = 0;
 
 static Eina_Bool
-_elm_signal_exit(void *data  __UNUSED__,
-                 int ev_type __UNUSED__,
-                 void *ev    __UNUSED__)
+_elm_signal_exit(void *data  EINA_UNUSED,
+                 int ev_type EINA_UNUSED,
+                 void *ev    EINA_UNUSED)
 {
    elm_exit();
    return ECORE_CALLBACK_PASS_ON;

legacy/elementary/src/lib/elm_map.c

@@ -53,7 +53,7 @@ EAPI Eo_Op ELM_OBJ_MAP_BASE_ID = EO_NOOP;
 #define NOMINATIM_ATTR_ADDRESS "display_name"
 
 static char *
-_mapnik_url_cb(const Evas_Object *obj __UNUSED__,
+_mapnik_url_cb(const Evas_Object *obj EINA_UNUSED,
                int x,
                int y,
                int zoom)
@@ -68,7 +68,7 @@ _mapnik_url_cb(const Evas_Object *obj __UNUSED__,
 }
 
 static char *
-_osmarender_url_cb(const Evas_Object *obj __UNUSED__,
+_osmarender_url_cb(const Evas_Object *obj EINA_UNUSED,
                    int x,
                    int y,
                    int zoom)
@@ -83,7 +83,7 @@ _osmarender_url_cb(const Evas_Object *obj __UNUSED__,
 }
 
 static char *
-_cyclemap_url_cb(const Evas_Object *obj __UNUSED__,
+_cyclemap_url_cb(const Evas_Object *obj EINA_UNUSED,
                  int x,
                  int y,
                  int zoom)
@@ -98,7 +98,7 @@ _cyclemap_url_cb(const Evas_Object *obj __UNUSED__,
 }
 
 static char *
-_mapquest_url_cb(const Evas_Object *obj __UNUSED__,
+_mapquest_url_cb(const Evas_Object *obj EINA_UNUSED,
                  int x,
                  int y,
                  int zoom)
@@ -113,7 +113,7 @@ _mapquest_url_cb(const Evas_Object *obj __UNUSED__,
 }
 
 static char *
-_mapquest_aerial_url_cb(const Evas_Object *obj __UNUSED__,
+_mapquest_aerial_url_cb(const Evas_Object *obj EINA_UNUSED,
                         int x,
                         int y,
                         int zoom)
@@ -127,7 +127,7 @@ _mapquest_aerial_url_cb(const Evas_Object *obj __UNUSED__,
 }
 
 static char *
-_yours_url_cb(const Evas_Object *obj __UNUSED__,
+_yours_url_cb(const Evas_Object *obj EINA_UNUSED,
               const char *type_name,
               int method,
               double flon,
@@ -148,7 +148,7 @@ _yours_url_cb(const Evas_Object *obj __UNUSED__,
 // TODO: fix monav api
 /*
    static char *
-   _monav_url_cb(const Evas_Object *obj __UNUSED__,
+   _monav_url_cb(const Evas_Object *obj EINA_UNUSED,
               char *type_name,
               int method,
               double flon,
@@ -168,7 +168,7 @@ _yours_url_cb(const Evas_Object *obj __UNUSED__,
    //TODO: fix ors api
 
    static char *
-   _ors_url_cb(const Evas_Object *obj __UNUSED__,
+   _ors_url_cb(const Evas_Object *obj EINA_UNUSED,
             char *type_name,
             int method,
             double flon,
@@ -241,8 +241,8 @@ const double _osm_scale_meter[] =
 };
 
 static double
-_scale_cb(const Evas_Object *obj __UNUSED__,
-          double lon __UNUSED__,
+_scale_cb(const Evas_Object *obj EINA_UNUSED,
+          double lon EINA_UNUSED,
           double lat,
           int zoom)
 {
@@ -733,7 +733,7 @@ _grid_item_free(Grid_Item *gi)
 
 static void
 _downloaded_cb(void *data,
-               const char *file __UNUSED__,
+               const char *file EINA_UNUSED,
                int status)
 {
    Grid_Item *gi = data;
@@ -1176,9 +1176,9 @@ _sizing_eval(Evas_Object *obj)
 
 static void
 _changed_size_hints_cb(void *data,
-                       Evas *e __UNUSED__,
-                       Evas_Object *obj __UNUSED__,
-                       void *event_info __UNUSED__)
+                       Evas *e EINA_UNUSED,
+                       Evas_Object *obj EINA_UNUSED,
+                       void *event_info EINA_UNUSED)
 {
    _sizing_eval(data);
 }
@@ -1198,7 +1198,7 @@ _scr_timeout_cb(void *data)
 
 static void
 _scroll_cb(Evas_Object *obj,
-           void *data __UNUSED__)
+           void *data EINA_UNUSED)
 {
    ELM_MAP_DATA_GET(obj, sd);
 
@@ -1212,7 +1212,7 @@ _scroll_cb(Evas_Object *obj,
 
 static void
 _scroll_animate_start_cb(Evas_Object *obj,
-                         void *data __UNUSED__)
+                         void *data EINA_UNUSED)
 {
    ELM_MAP_DATA_GET(obj, sd);
 
@@ -1222,7 +1222,7 @@ _scroll_animate_start_cb(Evas_Object *obj,
 
 static void
 _scroll_animate_stop_cb(Evas_Object *obj,
-                        void *data __UNUSED__)
+                        void *data EINA_UNUSED)
 {
    ELM_MAP_DATA_GET(obj, sd);
 
@@ -1244,8 +1244,8 @@ _long_press_cb(void *data)
 
 static void
 _mouse_down_cb(void *data,
-               Evas *evas __UNUSED__,
-               Evas_Object *obj __UNUSED__,
+               Evas *evas EINA_UNUSED,
+               Evas_Object *obj EINA_UNUSED,
                void *event_info)
 {
    ELM_MAP_DATA_GET(data, sd);
@@ -1270,8 +1270,8 @@ _mouse_down_cb(void *data,
 
 static void
 _mouse_up_cb(void *data,
-             Evas *evas __UNUSED__,
-             Evas_Object *obj __UNUSED__,
+             Evas *evas EINA_UNUSED,
+             Evas_Object *obj EINA_UNUSED,
              void *event_info)
 {
    ELM_MAP_DATA_GET(data, sd);
@@ -1294,8 +1294,8 @@ _mouse_up_cb(void *data,
 
 static void
 _mouse_wheel_cb(void *data,
-                Evas *e __UNUSED__,
-                Evas_Object *obj __UNUSED__,
+                Evas *e EINA_UNUSED,
+                Evas_Object *obj EINA_UNUSED,
                 void *event_info)
 {
    ELM_MAP_DATA_GET(data, sd);
@@ -1391,9 +1391,9 @@ _icon_dup(Evas_Object *icon,
 
 static void
 _overlay_clicked_cb(void *data,
-                    Evas *e __UNUSED__,
-                    Evas_Object *obj __UNUSED__,
-                    void *ev __UNUSED__)
+                    Evas *e EINA_UNUSED,
+                    Evas_Object *obj EINA_UNUSED,
+                    void *ev EINA_UNUSED)
 {
    Elm_Map_Overlay *overlay = data;
 
@@ -2661,7 +2661,7 @@ static Eina_Bool
 _xml_route_dump_cb(void *data,
                    Eina_Simple_XML_Type type,
                    const char *value,
-                   unsigned offset __UNUSED__,
+                   unsigned offset EINA_UNUSED,
                    unsigned length)
 {
    Route_Dump *dump = data;
@@ -2718,7 +2718,7 @@ static Eina_Bool
 _xml_name_dump_cb(void *data,
                   Eina_Simple_XML_Type type,
                   const char *value,
-                  unsigned offset __UNUSED__,
+                  unsigned offset EINA_UNUSED,
                   unsigned length)
 {
    Name_Dump *dump = data;
@@ -3203,7 +3203,7 @@ _name_list_request(const Evas_Object *obj,
 
 static Evas_Event_Flags
 _pinch_zoom_start_cb(void *data,
-                     void *event_info __UNUSED__)
+                     void *event_info EINA_UNUSED)
 {
    ELM_MAP_DATA_GET(data, sd);
 
@@ -3259,7 +3259,7 @@ _pinch_rotate_cb(void *data,
 
 static Evas_Event_Flags
 _pinch_rotate_end_cb(void *data,
-                     void *event_info __UNUSED__)
+                     void *event_info EINA_UNUSED)
 {
    ELM_MAP_DATA_GET(data, sd);
 
@@ -5928,15 +5928,15 @@ elm_map_track_remove(Evas_Object *obj,
 
 #else
 EAPI Evas_Object *
-elm_map_track_add(Evas_Object *obj __UNUSED__,
-                  void *emap __UNUSED__)
+elm_map_track_add(Evas_Object *obj EINA_UNUSED,
+                  void *emap EINA_UNUSED)
 {
    return NULL;
 }
 
 EAPI void
-elm_map_track_remove(Evas_Object *obj __UNUSED__,
-                     Evas_Object *route __UNUSED__)
+elm_map_track_remove(Evas_Object *obj EINA_UNUSED,
+                     Evas_Object *route EINA_UNUSED)
 {
 }
 #endif

legacy/elementary/src/lib/elm_mapbuf.c

@@ -48,9 +48,9 @@ _elm_mapbuf_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 
 static void
 _changed_size_hints_cb(void *data,
-                       Evas *e __UNUSED__,
-                       Evas_Object *obj __UNUSED__,
-                       void *event_info __UNUSED__)
+                       Evas *e EINA_UNUSED,
+                       Evas_Object *obj EINA_UNUSED,
+                       void *event_info EINA_UNUSED)
 {
    _sizing_eval(data);
 }

legacy/elementary/src/lib/elm_menu.c

@@ -325,27 +325,27 @@ _item_content_get_hook(const Elm_Object_Item *it,
 
 static void
 _menu_resize_cb(void *data,
-                Evas *e __UNUSED__,
-                Evas_Object *obj __UNUSED__,
-                void *event_info __UNUSED__)
+                Evas *e EINA_UNUSED,
+                Evas_Object *obj EINA_UNUSED,
+                void *event_info EINA_UNUSED)
 {
    _sizing_eval(data);
 }
 
 static void
 _parent_resize_cb(void *data,
-                  Evas *e __UNUSED__,
-                  Evas_Object *obj __UNUSED__,
-                  void *event_info __UNUSED__)
+                  Evas *e EINA_UNUSED,
+                  Evas_Object *obj EINA_UNUSED,
+                  void *event_info EINA_UNUSED)
 {
    _sizing_eval(data);
 }
 
 static void
 _parent_del_cb(void *data,
-               Evas *e __UNUSED__,
+               Evas *e EINA_UNUSED,
                Evas_Object *obj,
-               void *event_info __UNUSED__)
+               void *event_info EINA_UNUSED)
 {
    ELM_MENU_DATA_GET(data, sd);
    ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
@@ -357,9 +357,9 @@ _parent_del_cb(void *data,
 
 static void
 _item_move_resize_cb(void *data,
-                     Evas *e __UNUSED__,
-                     Evas_Object *obj __UNUSED__,
-                     void *event_info __UNUSED__)
+                     Evas *e EINA_UNUSED,
+                     Evas_Object *obj EINA_UNUSED,
+                     void *event_info EINA_UNUSED)
 {
    Elm_Menu_Item *item = data;
 
@@ -368,8 +368,8 @@ _item_move_resize_cb(void *data,
 
 static void
 _menu_hide(void *data,
-           Evas_Object *obj __UNUSED__,
-           void *event_info __UNUSED__)
+           Evas_Object *obj EINA_UNUSED,
+           void *event_info EINA_UNUSED)
 {
    Eina_List *l;
    Elm_Menu_Item *item2;
@@ -400,9 +400,9 @@ _hover_dismissed_cb(void *data,
 
 static void
 _submenu_open_cb(void *data,
-                 Evas_Object *obj __UNUSED__,
-                 const char *emission __UNUSED__,
-                 const char *source __UNUSED__)
+                 Evas_Object *obj EINA_UNUSED,
+                 const char *emission EINA_UNUSED,
+                 const char *source EINA_UNUSED)
 {
    Elm_Menu_Item *item = data;
 
@@ -421,9 +421,9 @@ _elm_dbus_menu_item_select_cb(Elm_Object_Item *obj_item)
 
 static void
 _menu_item_select_cb(void *data,
-                     Evas_Object *obj __UNUSED__,
-                     const char *emission __UNUSED__,
-                     const char *source __UNUSED__)
+                     Evas_Object *obj EINA_UNUSED,
+                     const char *emission EINA_UNUSED,
+                     const char *source EINA_UNUSED)
 {
    Elm_Menu_Item *item = data;
 
@@ -439,9 +439,9 @@ _menu_item_select_cb(void *data,
 
 static void
 _menu_item_activate_cb(void *data,
-                       Evas_Object *obj __UNUSED__,
-                       const char *emission __UNUSED__,
-                       const char *source __UNUSED__)
+                       Evas_Object *obj EINA_UNUSED,
+                       const char *emission EINA_UNUSED,
+                       const char *source EINA_UNUSED)
 {
    Eina_List *l;
    Elm_Menu_Item *item2;
@@ -469,9 +469,9 @@ _menu_item_activate_cb(void *data,
 
 static void
 _menu_item_inactivate_cb(void *data,
-                         Evas_Object *obj __UNUSED__,
-                         const char *emission __UNUSED__,
-                         const char *source __UNUSED__)
+                         Evas_Object *obj EINA_UNUSED,
+                         const char *emission EINA_UNUSED,
+                         const char *source EINA_UNUSED)
 {
    Elm_Menu_Item *item = data;
 

legacy/elementary/src/lib/elm_notify.c

@@ -169,9 +169,9 @@ _calc(Evas_Object *obj)
 
 static void
 _changed_size_hints_cb(void *data,
-                       Evas *e __UNUSED__,
-                       Evas_Object *obj __UNUSED__,
-                       void *event_info __UNUSED__)
+                       Evas *e EINA_UNUSED,
+                       Evas_Object *obj EINA_UNUSED,
+                       void *event_info EINA_UNUSED)
 {
    _calc(data);
 }
@@ -201,18 +201,18 @@ _elm_notify_smart_sub_object_del(Eo *obj, void *_pd, va_list *list)
 
 static void
 _block_area_clicked_cb(void *data,
-                       Evas_Object *obj __UNUSED__,
-                       const char *emission __UNUSED__,
-                       const char *source __UNUSED__)
+                       Evas_Object *obj EINA_UNUSED,
+                       const char *emission EINA_UNUSED,
+                       const char *source EINA_UNUSED)
 {
    evas_object_smart_callback_call(data, SIG_BLOCK_CLICKED, NULL);
 }
 
 static void
-_restack_cb(void *data __UNUSED__,
-            Evas *e __UNUSED__,
+_restack_cb(void *data EINA_UNUSED,
+            Evas *e EINA_UNUSED,
             Evas_Object *obj,
-            void *event_info __UNUSED__)
+            void *event_info EINA_UNUSED)
 {
    ELM_NOTIFY_DATA_GET(obj, sd);
 
@@ -318,9 +318,9 @@ _elm_notify_smart_hide(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 
 static void
 _parent_del_cb(void *data,
-               Evas *e __UNUSED__,
-               Evas_Object *obj __UNUSED__,
-               void *event_info __UNUSED__)
+               Evas *e EINA_UNUSED,
+               Evas_Object *obj EINA_UNUSED,
+               void *event_info EINA_UNUSED)
 {
    elm_notify_parent_set(data, NULL);
    evas_object_hide(data);
@@ -328,9 +328,9 @@ _parent_del_cb(void *data,
 
 static void
 _parent_hide_cb(void *data,
-                Evas *e __UNUSED__,
-                Evas_Object *obj __UNUSED__,
-                void *event_info __UNUSED__)
+                Evas *e EINA_UNUSED,
+                Evas_Object *obj EINA_UNUSED,
+                void *event_info EINA_UNUSED)
 {
    evas_object_hide(data);
 }
@@ -460,9 +460,9 @@ _elm_notify_smart_content_unset(Eo *obj, void *_pd, va_list *list)
 
 static void
 _hide_finished_cb(void *data,
-                  Evas_Object *obj __UNUSED__,
-                  const char *emission __UNUSED__,
-                  const char *source __UNUSED__)
+                  Evas_Object *obj EINA_UNUSED,
+                  const char *emission EINA_UNUSED,
+                  const char *source EINA_UNUSED)
 {
    ELM_NOTIFY_DATA_GET(data, sd);
    sd->had_hidden = EINA_TRUE;

legacy/elementary/src/lib/elm_panel.c

@@ -47,7 +47,7 @@ _elm_panel_smart_sizing_eval(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 }
 
 static char *
-_access_state_cb(void *data, Evas_Object *obj __UNUSED__)
+_access_state_cb(void *data, Evas_Object *obj EINA_UNUSED)
 {
    ELM_PANEL_DATA_GET(data, sd);
 
@@ -212,16 +212,16 @@ end:
 static void
 _box_layout_cb(Evas_Object *o,
                Evas_Object_Box_Data *priv,
-               void *data __UNUSED__)
+               void *data EINA_UNUSED)
 {
    _els_box_layout(o, priv, EINA_TRUE, EINA_FALSE, EINA_FALSE);
 }
 
 static void
-_panel_toggle(void *data __UNUSED__,
+_panel_toggle(void *data EINA_UNUSED,
               Evas_Object *obj,
-              const char *emission __UNUSED__,
-              const char *source __UNUSED__)
+              const char *emission EINA_UNUSED,
+              const char *source EINA_UNUSED)
 {
    ELM_PANEL_DATA_GET(obj, sd);
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);

legacy/elementary/src/lib/elm_panes.c

@@ -148,18 +148,18 @@ _elm_panes_smart_focus_next(Eo *obj, void *_pd, va_list *list)
 
 static void
 _on_clicked(void *data,
-            Evas_Object *obj __UNUSED__,
-            const char *emission __UNUSED__,
-            const char *source __UNUSED__)
+            Evas_Object *obj EINA_UNUSED,
+            const char *emission EINA_UNUSED,
+            const char *source EINA_UNUSED)
 {
    evas_object_smart_callback_call(data, SIG_CLICKED, NULL);
 }
 
 static void
 _double_clicked(void *data,
-                Evas_Object *obj __UNUSED__,
-                const char *emission __UNUSED__,
-                const char *source __UNUSED__)
+                Evas_Object *obj EINA_UNUSED,
+                const char *emission EINA_UNUSED,
+                const char *source EINA_UNUSED)
 {
    ELM_PANES_DATA_GET(data, sd);
 
@@ -168,18 +168,18 @@ _double_clicked(void *data,
 
 static void
 _on_pressed(void *data,
-            Evas_Object *obj __UNUSED__,
-            const char *emission __UNUSED__,
-            const char *source __UNUSED__)
+            Evas_Object *obj EINA_UNUSED,
+            const char *emission EINA_UNUSED,
+            const char *source EINA_UNUSED)
 {
    evas_object_smart_callback_call(data, SIG_PRESS, NULL);
 }
 
 static void
 _on_unpressed(void *data,
-              Evas_Object *obj __UNUSED__,
-              const char *emission __UNUSED__,
-              const char *source __UNUSED__)
+              Evas_Object *obj EINA_UNUSED,
+              const char *emission EINA_UNUSED,
+              const char *source EINA_UNUSED)
 {
    ELM_PANES_DATA_GET(data, sd);
    evas_object_smart_callback_call(data, SIG_UNPRESS, NULL);

legacy/elementary/src/lib/elm_photo.c

@@ -78,9 +78,9 @@ _elm_photo_smart_theme(Eo *obj, void *_pd, va_list *list)
 
 static void
 _icon_move_resize_cb(void *data,
-                     Evas *e __UNUSED__,
-                     Evas_Object *obj __UNUSED__,
-                     void *event_info __UNUSED__)
+                     Evas *e EINA_UNUSED,
+                     Evas_Object *obj EINA_UNUSED,
+                     void *event_info EINA_UNUSED)
 {
    Evas_Coord w, h;
 
@@ -107,7 +107,7 @@ _icon_move_resize_cb(void *data,
 }
 
 static void
-_drag_done_cb(void *unused __UNUSED__,
+_drag_done_cb(void *unused EINA_UNUSED,
               Evas_Object *obj)
 {
    ELM_PHOTO_DATA_GET(obj, sd);
@@ -119,7 +119,7 @@ _drag_done_cb(void *unused __UNUSED__,
 
 static void
 _mouse_move(void *data,
-            Evas *e __UNUSED__,
+            Evas *e EINA_UNUSED,
             Evas_Object *icon,
             void *event)
 {
@@ -185,9 +185,9 @@ _long_press_cb(void *obj)
 
 static void
 _mouse_down(void *data,
-            Evas *e __UNUSED__,
+            Evas *e EINA_UNUSED,
             Evas_Object *icon,
-            void *event_info __UNUSED__)
+            void *event_info EINA_UNUSED)
 {
    Evas_Event_Mouse_Down *ev = event_info;
 
@@ -204,9 +204,9 @@ _mouse_down(void *data,
 
 static void
 _mouse_up(void *data,
-          Evas *e __UNUSED__,
-          Evas_Object *obj __UNUSED__,
-          void *event_info __UNUSED__)
+          Evas *e EINA_UNUSED,
+          Evas_Object *obj EINA_UNUSED,
+          void *event_info EINA_UNUSED)
 {
    Evas_Event_Mouse_Up *ev = event_info;
    ELM_PHOTO_DATA_GET(data, sd);
@@ -247,8 +247,8 @@ _elm_photo_internal_image_follow(Evas_Object *obj)
 
 static void
 _on_thumb_done(void *data,
-               Evas_Object *obj __UNUSED__,
-               void *event __UNUSED__)
+               Evas_Object *obj EINA_UNUSED,
+               void *event EINA_UNUSED)
 {
    _elm_photo_internal_image_follow(data);
 }

legacy/elementary/src/lib/elm_photocam.c

@@ -521,9 +521,9 @@ _grid_clear(Evas_Object *obj,
 
 static void
 _tile_preloaded_cb(void *data,
-                   Evas *e __UNUSED__,
-                   Evas_Object *o __UNUSED__,
-                   void *event_info __UNUSED__)
+                   Evas *e EINA_UNUSED,
+                   Evas_Object *o EINA_UNUSED,
+                   void *event_info EINA_UNUSED)
 {
    Elm_Photocam_Grid_Item *git = data;
    ELM_PHOTOCAM_DATA_GET(git->obj, sd);
@@ -716,9 +716,9 @@ _scroll_timeout_cb(void *data)
 
 static void
 _main_img_preloaded_cb(void *data,
-                       Evas *e __UNUSED__,
-                       Evas_Object *o __UNUSED__,
-                       void *event_info __UNUSED__)
+                       Evas *e EINA_UNUSED,
+                       Evas_Object *o EINA_UNUSED,
+                       void *event_info EINA_UNUSED)
 {
    Evas_Object *obj = data;
    Elm_Phocam_Grid *g;
@@ -838,8 +838,8 @@ _long_press_cb(void *data)
 
 static void
 _mouse_down_cb(void *data,
-               Evas *evas __UNUSED__,
-               Evas_Object *obj __UNUSED__,
+               Evas *evas EINA_UNUSED,
+               Evas_Object *obj EINA_UNUSED,
                void *event_info)
 {
    Evas_Event_Mouse_Down *ev = event_info;
@@ -861,8 +861,8 @@ _mouse_down_cb(void *data,
 
 static void
 _mouse_up_cb(void *data,
-             Evas *evas __UNUSED__,
-             Evas_Object *obj __UNUSED__,
+             Evas *evas EINA_UNUSED,
+             Evas_Object *obj EINA_UNUSED,
              void *event_info)
 {
    Evas_Event_Mouse_Up *ev = event_info;
@@ -921,35 +921,35 @@ _elm_photocam_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 
 static void
 _scroll_animate_start_cb(Evas_Object *obj,
-                         void *data __UNUSED__)
+                         void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call(obj, SIG_SCROLL_ANIM_START, NULL);
 }
 
 static void
 _scroll_animate_stop_cb(Evas_Object *obj,
-                        void *data __UNUSED__)
+                        void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call(obj, SIG_SCROLL_ANIM_STOP, NULL);
 }
 
 static void
 _scroll_drag_start_cb(Evas_Object *obj,
-                      void *data __UNUSED__)
+                      void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call(obj, SIG_SCROLL_DRAG_START, NULL);
 }
 
 static void
 _scroll_drag_stop_cb(Evas_Object *obj,
-                     void *data __UNUSED__)
+                     void *data EINA_UNUSED)
 {
    evas_object_smart_callback_call(obj, SIG_SCROLL_DRAG_STOP, NULL);
 }
 
 static void
 _scroll_cb(Evas_Object *obj,
-           void *data __UNUSED__)
+           void *data EINA_UNUSED)
 {
    ELM_PHOTOCAM_DATA_GET(obj, sd);
 
@@ -1222,7 +1222,7 @@ _g_layer_zoom_move_cb(void *data,
 
 static Evas_Event_Flags
 _g_layer_zoom_end_cb(void *data,
-                     void *event_info __UNUSED__)
+                     void *event_info EINA_UNUSED)
 {
    Evas_Object *obj = data;
    ELM_PHOTOCAM_DATA_GET(obj, sd);
@@ -2108,7 +2108,7 @@ elm_photocam_image_region_bring_in(Evas_Object *obj,
                                    int x,
                                    int y,
                                    int w,
-                                   int h __UNUSED__)
+                                   int h EINA_UNUSED)
 {
    ELM_PHOTOCAM_CHECK(obj);
    eo_do(obj, elm_scrollable_interface_region_bring_in(x, y, w, h));