__UNUSED__ -> EINA_UNUSED

this has been bugging me forever. __UNUSED__ is no longer a valid macro here.

22 files changed, 99 insertions, 99 deletions

diff --git a/src/modules/wizard/e_mod_main.c b/src/modules/wizard/e_mod_main.c
index 7c5a5ad173..d2fffb0e9e 100644
--- a/src/modules/wizard/e_mod_main.c
+++ b/src/modules/wizard/e_mod_main.c
@@ -91,7 +91,7 @@ e_modapi_init(E_Module *m)
 }
 
 EAPI int
-e_modapi_shutdown(E_Module *m __UNUSED__)
+e_modapi_shutdown(E_Module *m EINA_UNUSED)
 {
    e_wizard_shutdown();
    wiz_module = NULL;
@@ -102,7 +102,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
 }
 
 EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
+e_modapi_save(E_Module *m EINA_UNUSED)
 {
    return 1;
 }
diff --git a/src/modules/wizard/e_wizard.c b/src/modules/wizard/e_wizard.c
index 4f1b8d255d..24df045f14 100644
--- a/src/modules/wizard/e_wizard.c
+++ b/src/modules/wizard/e_wizard.c
@@ -310,7 +310,7 @@ _e_wizard_cb_key_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
 }
 
 static void
-_e_wizard_cb_next(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
+_e_wizard_cb_next(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
 {
    /* TODO: Disable button in theme */
    if (next_can)
@@ -379,7 +379,7 @@ _e_wizard_next_xdg(void)
 }
 
 static Eina_Bool
-_e_wizard_cb_next_page(void *data __UNUSED__)
+_e_wizard_cb_next_page(void *data EINA_UNUSED)
 {
    next_timer = NULL;
    _e_wizard_next_xdg();
@@ -388,7 +388,7 @@ _e_wizard_cb_next_page(void *data __UNUSED__)
 
 
 static Eina_Bool
-_e_wizard_cb_desktops_update(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
+_e_wizard_cb_desktops_update(void *data EINA_UNUSED, int ev_type EINA_UNUSED, void *ev)
 {
    Efreet_Event_Cache_Update *e;
 
@@ -403,7 +403,7 @@ _e_wizard_cb_desktops_update(void *data __UNUSED__, int ev_type __UNUSED__, void
 }
 
 static Eina_Bool
-_e_wizard_cb_icons_update(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__)
+_e_wizard_cb_icons_update(void *data EINA_UNUSED, int ev_type EINA_UNUSED, void *ev EINA_UNUSED)
 {
    got_icons = EINA_TRUE;
    if (_e_wizard_check_xdg())
diff --git a/src/modules/wizard/page_000.c b/src/modules/wizard/page_000.c
index 4727c2078f..a739d5893b 100644
--- a/src/modules/wizard/page_000.c
+++ b/src/modules/wizard/page_000.c
@@ -6,19 +6,19 @@ static Ecore_Timer *_next_timer = NULL;
 
 /*
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED)
 {
    return 1;
 }
 
 EAPI int
-wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
+wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
 */
 static Eina_Bool
-_next_page(void *data __UNUSED__)
+_next_page(void *data EINA_UNUSED)
 {
    _next_timer = NULL;
    e_wizard_button_next_enable_set(1);
@@ -27,7 +27,7 @@ _next_page(void *data __UNUSED__)
 }
 
 EAPI int
-wizard_page_show(E_Wizard_Page *pg __UNUSED__)
+wizard_page_show(E_Wizard_Page *pg EINA_UNUSED)
 {
    Evas_Object *o;
 
@@ -44,7 +44,7 @@ wizard_page_show(E_Wizard_Page *pg __UNUSED__)
 }
 
 EAPI int
-wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
+wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED)
 {
    if (_next_timer) ecore_timer_del(_next_timer);
    _next_timer = NULL;
@@ -52,7 +52,7 @@ wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
 }
 /*
 EAPI int
-wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
+wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
diff --git a/src/modules/wizard/page_010.c b/src/modules/wizard/page_010.c
index daa667214a..755dae013c 100644
--- a/src/modules/wizard/page_010.c
+++ b/src/modules/wizard/page_010.c
@@ -82,7 +82,7 @@ _basic_lang_list_sort(const void *data1, const void *data2)
 }
 
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED)
 {
    FILE *output;
 
@@ -143,7 +143,7 @@ wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UN
 }
 
 EAPI int
-wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
+wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED)
 {
    eina_list_free(blang_list);
    return 1;
@@ -223,7 +223,7 @@ wizard_page_show(E_Wizard_Page *pg)
 }
 
 EAPI int
-wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
+wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED)
 {
 //   evas_object_del(pg->data);
 /* special - language inits its stuff the moment it goes away */
@@ -239,7 +239,7 @@ wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
 }
 
 EAPI int
-wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
+wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED)
 {
    // do this again as we want it to apply to the new profile
    eina_stringshare_del(e_config->language);
diff --git a/src/modules/wizard/page_011.c b/src/modules/wizard/page_011.c
index 2681dfc610..41bf68a072 100644
--- a/src/modules/wizard/page_011.c
+++ b/src/modules/wizard/page_011.c
@@ -121,7 +121,7 @@ implement_layout(void)
 }
 
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED)
 {
    // parse kbd rules here
    find_rules();
@@ -130,7 +130,7 @@ wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UN
 }
 /*
 EAPI int
-wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
+wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
@@ -186,7 +186,7 @@ wizard_page_show(E_Wizard_Page *pg)
 }
 
 EAPI int
-wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
+wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED)
 {
    /* special - key layout inits its stuff the moment it goes away */
    implement_layout();
@@ -194,7 +194,7 @@ wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
 }
 
 EAPI int
-wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
+wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED)
 {
    // do this again as we want it to apply to the new profile
    implement_layout();
diff --git a/src/modules/wizard/page_020.c b/src/modules/wizard/page_020.c
index 8a1b33be0c..b08764cebb 100644
--- a/src/modules/wizard/page_020.c
+++ b/src/modules/wizard/page_020.c
@@ -5,7 +5,7 @@ static const char *profile = NULL;
 static Evas_Object *textblock = NULL;
 
 static void
-_profile_change(void *data __UNUSED__, Evas_Object *obj __UNUSED__)
+_profile_change(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED)
 {
    char buf[PATH_MAX];
    char *dir;
@@ -28,13 +28,13 @@ _profile_change(void *data __UNUSED__, Evas_Object *obj __UNUSED__)
 }
 /*
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED)
 {
    return 1;
 }
 
 EAPI int
-wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
+wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
@@ -134,7 +134,7 @@ wizard_page_show(E_Wizard_Page *pg)
 }
 
 EAPI int
-wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
+wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED)
 {
 //   evas_object_del(pg->data);
 // actually apply profile
@@ -147,7 +147,7 @@ wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
 }
 /*
 EAPI int
-wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
+wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
diff --git a/src/modules/wizard/page_030.c b/src/modules/wizard/page_030.c
index a878b7cfb9..2b93cd51b2 100644
--- a/src/modules/wizard/page_030.c
+++ b/src/modules/wizard/page_030.c
@@ -2,19 +2,19 @@
 #include "e_wizard.h"
 /*
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED)
 {
    return 1;
 }
 
 EAPI int
-wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
+wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
 */
 EAPI int
-wizard_page_show(E_Wizard_Page *pg __UNUSED__)
+wizard_page_show(E_Wizard_Page *pg EINA_UNUSED)
 {
    char buf[PATH_MAX];
 
@@ -25,13 +25,13 @@ wizard_page_show(E_Wizard_Page *pg __UNUSED__)
 }
 /*
 EAPI int
-wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
+wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
 
 EAPI int
-wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
+wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
diff --git a/src/modules/wizard/page_040.c b/src/modules/wizard/page_040.c
index 71dd1fdee6..fc255dde0e 100644
--- a/src/modules/wizard/page_040.c
+++ b/src/modules/wizard/page_040.c
@@ -4,20 +4,20 @@
 static Ecore_Timer *_next_timer = NULL;
 
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops, Eina_Bool *need_xdg_icons __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops, Eina_Bool *need_xdg_icons EINA_UNUSED)
 {
    *need_xdg_desktops = EINA_TRUE;
    return 1;
 }
 /*
 EAPI int
-wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
+wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
 */
 static Eina_Bool
-_next_page(void *data __UNUSED__)
+_next_page(void *data EINA_UNUSED)
 {
    _next_timer = NULL;
    e_wizard_button_next_enable_set(1);
@@ -26,7 +26,7 @@ _next_page(void *data __UNUSED__)
 }
 
 EAPI int
-wizard_page_show(E_Wizard_Page *pg __UNUSED__)
+wizard_page_show(E_Wizard_Page *pg EINA_UNUSED)
 {
    Eina_List *extra_desks, *desks;
    Efreet_Desktop *desk, *extra_desk;
@@ -111,7 +111,7 @@ wizard_page_show(E_Wizard_Page *pg __UNUSED__)
 }
 
 EAPI int
-wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
+wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED)
 {
    if (_next_timer) ecore_timer_del(_next_timer);
    _next_timer = NULL;
@@ -119,7 +119,7 @@ wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
 }
 /*
 EAPI int
-wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
+wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
diff --git a/src/modules/wizard/page_050.c b/src/modules/wizard/page_050.c
index e06b3621d1..7a8e4a45b6 100644
--- a/src/modules/wizard/page_050.c
+++ b/src/modules/wizard/page_050.c
@@ -5,13 +5,13 @@ static double scale = 1.0;
 static Eina_List *obs = NULL;
 /*
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED)
 {
    return 1;
 }
 
 EAPI int
-wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
+wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
@@ -42,7 +42,7 @@ _scale_preview_sel_set(Evas_Object *ob, int sel)
 }
 
 static void
-_scale_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+_scale_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Evas_Object *ob = data;
 
@@ -173,7 +173,7 @@ wizard_page_show(E_Wizard_Page *pg)
 }
 
 EAPI int
-wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
+wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED)
 {
    obs = eina_list_free(obs);
 //   evas_object_del(pg->data);
@@ -186,7 +186,7 @@ wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
 }
 /*
 EAPI int
-wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
+wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
diff --git a/src/modules/wizard/page_060.c b/src/modules/wizard/page_060.c
index 00a1bad27c..5f12a79bbf 100644
--- a/src/modules/wizard/page_060.c
+++ b/src/modules/wizard/page_060.c
@@ -4,13 +4,13 @@
 static int focus_mode = 1;
 /*
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED)
 {
    return 1;
 }
 
 EAPI int
-wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
+wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
@@ -46,7 +46,7 @@ wizard_page_show(E_Wizard_Page *pg)
 }
 
 EAPI int
-wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
+wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED)
 {
    if (!focus_mode)
      {
@@ -80,7 +80,7 @@ wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
 }
 /*
 EAPI int
-wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
+wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
diff --git a/src/modules/wizard/page_070.c b/src/modules/wizard/page_070.c
index b681c7f625..02a6a63854 100644
--- a/src/modules/wizard/page_070.c
+++ b/src/modules/wizard/page_070.c
@@ -2,20 +2,20 @@
 #include "e_wizard.h"
 
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons)
+wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons)
 {
    *need_xdg_icons = EINA_TRUE;
    return 1;
 }
 /*
 EAPI int
-wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
+wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
 */
 EAPI int
-wizard_page_show(E_Wizard_Page *pg __UNUSED__)
+wizard_page_show(E_Wizard_Page *pg EINA_UNUSED)
 {
    Eina_List *l, *themes = efreet_icon_theme_list_get();
    Efreet_Icon_Theme *th;
@@ -56,13 +56,13 @@ done:
 }
 /*
 EAPI int
-wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
+wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
 
 EAPI int
-wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
+wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
diff --git a/src/modules/wizard/page_080.c b/src/modules/wizard/page_080.c
index efb9ae2f78..fecd8d4477 100644
--- a/src/modules/wizard/page_080.c
+++ b/src/modules/wizard/page_080.c
@@ -2,20 +2,20 @@
 #include "e_wizard.h"
 
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops, Eina_Bool *need_xdg_icons __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops, Eina_Bool *need_xdg_icons EINA_UNUSED)
 {
    *need_xdg_desktops = EINA_TRUE;
    return 1;
 }
 /*
 EAPI int
-wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
+wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
 */
 EAPI int
-wizard_page_show(E_Wizard_Page *pg __UNUSED__)
+wizard_page_show(E_Wizard_Page *pg EINA_UNUSED)
 {
    FILE *f, *fin;
    char buf[PATH_MAX];
@@ -63,13 +63,13 @@ wizard_page_show(E_Wizard_Page *pg __UNUSED__)
 }
 /*
 EAPI int
-wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
+wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
 
 EAPI int
-wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
+wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
diff --git a/src/modules/wizard/page_090.c b/src/modules/wizard/page_090.c
index 343ef2e028..f5814807fc 100644
--- a/src/modules/wizard/page_090.c
+++ b/src/modules/wizard/page_090.c
@@ -32,19 +32,19 @@ read_file(const char *file)
 }
 /*
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED)
 {
    return 1;
 }
 
 EAPI int
-wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
+wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
 */
 EAPI int
-wizard_page_show(E_Wizard_Page *pg __UNUSED__)
+wizard_page_show(E_Wizard_Page *pg EINA_UNUSED)
 {
    int hav_bat = 0;
    Eina_List *dir;
@@ -117,13 +117,13 @@ wizard_page_show(E_Wizard_Page *pg __UNUSED__)
 }
 /*
 EAPI int
-wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
+wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
 
 EAPI int
-wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
+wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
diff --git a/src/modules/wizard/page_100.c b/src/modules/wizard/page_100.c
index 61dbe553a2..0f46b18fb2 100644
--- a/src/modules/wizard/page_100.c
+++ b/src/modules/wizard/page_100.c
@@ -31,19 +31,19 @@ read_file(const char *file)
 #endif
 /*
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED)
 {
    return 1;
 }
 
 EAPI int
-wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
+wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
 */
 EAPI int
-wizard_page_show(E_Wizard_Page *pg __UNUSED__)
+wizard_page_show(E_Wizard_Page *pg EINA_UNUSED)
 {
    int hav_cpufreq = 0;
 #ifdef __FreeBSD__
@@ -93,13 +93,13 @@ wizard_page_show(E_Wizard_Page *pg __UNUSED__)
 }
 /*
 EAPI int
-wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
+wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
 
 EAPI int
-wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
+wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
diff --git a/src/modules/wizard/page_110.c b/src/modules/wizard/page_110.c
index 3904b1d9ee..c833c2764f 100644
--- a/src/modules/wizard/page_110.c
+++ b/src/modules/wizard/page_110.c
@@ -78,7 +78,7 @@ _page_next_call(void *data EINA_UNUSED)
 
 static void
 _check_connman_owner(void *data, const Eldbus_Message *msg,
-                     Eldbus_Pending *pending __UNUSED__)
+                     Eldbus_Pending *pending EINA_UNUSED)
 {
    const char *id;
    pending_connman = NULL;
@@ -108,13 +108,13 @@ fail:
 /*
 
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED)
 {
    return 1;
 }
 
 EAPI int
-wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
+wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
@@ -165,7 +165,7 @@ wizard_page_show(E_Wizard_Page *pg)
 }
 
 EAPI int
-wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
+wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED)
 {
    if (pending_connman)
      {
@@ -189,7 +189,7 @@ wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
 }
 /*
 EAPI int
-wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
+wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
diff --git a/src/modules/wizard/page_120.c b/src/modules/wizard/page_120.c
index a7079ad710..ee7e983729 100644
--- a/src/modules/wizard/page_120.c
+++ b/src/modules/wizard/page_120.c
@@ -78,19 +78,19 @@ _wizard_temperature_get_bus_files(const char *bus)
 
 /*
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED)
 {
    return 1;
 }
 
 EAPI int
-wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
+wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
 */
 EAPI int
-wizard_page_show(E_Wizard_Page *pg __UNUSED__)
+wizard_page_show(E_Wizard_Page *pg EINA_UNUSED)
 {
    Eina_List *tempdevs = NULL;
    const char *sensor_path[] = {
@@ -190,13 +190,13 @@ wizard_page_show(E_Wizard_Page *pg __UNUSED__)
 }
 /*
 EAPI int
-wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
+wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
 
 EAPI int
-wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
+wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
diff --git a/src/modules/wizard/page_130.c b/src/modules/wizard/page_130.c
index a37b82d400..307d436c96 100644
--- a/src/modules/wizard/page_130.c
+++ b/src/modules/wizard/page_130.c
@@ -2,19 +2,19 @@
 #include "e_wizard.h"
 /*
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED)
 {
    return 1;
 }
 
 EAPI int
-wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
+wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
 */
 EAPI int
-wizard_page_show(E_Wizard_Page *pg __UNUSED__)
+wizard_page_show(E_Wizard_Page *pg EINA_UNUSED)
 {
    int hav_backlight = 0;
 
@@ -42,13 +42,13 @@ wizard_page_show(E_Wizard_Page *pg __UNUSED__)
 }
 /*
 EAPI int
-wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
+wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
 
 EAPI int
-wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
+wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
diff --git a/src/modules/wizard/page_150.c b/src/modules/wizard/page_150.c
index 2064fa968b..8f3786247e 100644
--- a/src/modules/wizard/page_150.c
+++ b/src/modules/wizard/page_150.c
@@ -101,7 +101,7 @@ wizard_page_show(E_Wizard_Page *pg)
 }
 
 EAPI int
-wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
+wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED)
 {
    E_Comp_Config *conf = NULL;
 
diff --git a/src/modules/wizard/page_160.c b/src/modules/wizard/page_160.c
index 2f202f4407..5e9033ccb1 100644
--- a/src/modules/wizard/page_160.c
+++ b/src/modules/wizard/page_160.c
@@ -2,19 +2,19 @@
 #include "e_wizard.h"
 /*
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED)
 {
    return 1;
 }
 
 EAPI int
-wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
+wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
 */
 EAPI int
-wizard_page_show(E_Wizard_Page *pg __UNUSED__)
+wizard_page_show(E_Wizard_Page *pg EINA_UNUSED)
 {
    Eina_List *files;
    char buf[PATH_MAX], buf2[PATH_MAX], *file;
@@ -38,13 +38,13 @@ wizard_page_show(E_Wizard_Page *pg __UNUSED__)
 }
 /*
 EAPI int
-wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
+wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
 
 EAPI int
-wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
+wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
diff --git a/src/modules/wizard/page_170.c b/src/modules/wizard/page_170.c
index 0fe0dc1e15..1cdd097f64 100644
--- a/src/modules/wizard/page_170.c
+++ b/src/modules/wizard/page_170.c
@@ -4,13 +4,13 @@
 static int do_up = 1;
 /*
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED)
 {
    return 1;
 }
 
 EAPI int
-wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
+wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
@@ -62,7 +62,7 @@ wizard_page_show(E_Wizard_Page *pg)
 }
 
 EAPI int
-wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
+wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED)
 {
    e_config->update.check = do_up;
    e_config_save_queue();
@@ -70,7 +70,7 @@ wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
 }
 /*
 EAPI int
-wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
+wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
diff --git a/src/modules/wizard/page_180.c b/src/modules/wizard/page_180.c
index ac057897a2..f9cdf00b0d 100644
--- a/src/modules/wizard/page_180.c
+++ b/src/modules/wizard/page_180.c
@@ -4,13 +4,13 @@
 static int do_tasks = 1;
 /*
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED)
 {
    return 1;
 }
 
 EAPI int
-wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
+wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
@@ -47,13 +47,13 @@ wizard_page_show(E_Wizard_Page *pg)
 }
 /*
 EAPI int
-wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
+wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
 */
 EAPI int
-wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
+wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED)
 {
    E_Config_Module *em;
    Eina_List *l;
diff --git a/src/modules/wizard/page_200.c b/src/modules/wizard/page_200.c
index cdfbd52f9e..bb2d1d3b55 100644
--- a/src/modules/wizard/page_200.c
+++ b/src/modules/wizard/page_200.c
@@ -3,31 +3,31 @@
 
 #if 0
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED)
 {
    return 1;
 }
 
 EAPI int
-wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
+wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
 
 EAPI int
-wizard_page_show(E_Wizard_Page *pg __UNUSED__)
+wizard_page_show(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 0; /* 1 == show ui, and wait for user, 0 == just continue */
 }
 
 EAPI int
-wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
+wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED)
 {
    return 1;
 }
 #endif
 EAPI int
-wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
+wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED)
 {
    // save the config now everyone has modified it
    e_config_save();