11 files changed, 66 insertions, 66 deletions

diff --git a/src/modules/mixer/app_mixer.c b/src/modules/mixer/app_mixer.c
index 6793597183..3800ee92ec 100644
--- a/src/modules/mixer/app_mixer.c
+++ b/src/modules/mixer/app_mixer.c
@@ -52,7 +52,7 @@ typedef struct E_Mixer_App_Dialog_Data
 } E_Mixer_App_Dialog_Data;
 
 static void
-_cb_changed_left(void *data, Evas_Object *obj __UNUSED__)
+_cb_changed_left(void *data, Evas_Object *obj EINA_UNUSED)
 {
    E_Mixer_App_Dialog_Data *app = data;
    E_Mixer_Channel_State *state;
@@ -70,7 +70,7 @@ _cb_changed_left(void *data, Evas_Object *obj __UNUSED__)
 }
 
 static void
-_cb_changed_right(void *data, Evas_Object *obj __UNUSED__)
+_cb_changed_right(void *data, Evas_Object *obj EINA_UNUSED)
 {
    E_Mixer_App_Dialog_Data *app = data;
    E_Mixer_Channel_State *state;
@@ -88,7 +88,7 @@ _cb_changed_right(void *data, Evas_Object *obj __UNUSED__)
 }
 
 static void
-_cb_changed_mute(void *data, Evas_Object *obj __UNUSED__)
+_cb_changed_mute(void *data, Evas_Object *obj EINA_UNUSED)
 {
    E_Mixer_App_Dialog_Data *app = data;
 
@@ -96,7 +96,7 @@ _cb_changed_mute(void *data, Evas_Object *obj __UNUSED__)
 }
 
 static void
-_cb_changed_lock_sliders(void *data, Evas_Object *obj __UNUSED__)
+_cb_changed_lock_sliders(void *data, Evas_Object *obj EINA_UNUSED)
 {
    E_Mixer_App_Dialog_Data *app = data;
    E_Mixer_Channel_State *state;
@@ -232,7 +232,7 @@ _cb_channel_selected(void *data)
 }
 
 static int
-_cb_system_update(void *data, E_Mixer_System *sys __UNUSED__)
+_cb_system_update(void *data, E_Mixer_System *sys EINA_UNUSED)
 {
    E_Mixer_App_Dialog_Data *app = data;
    E_Mixer_Channel_State state;
@@ -319,7 +319,7 @@ _cb_card_selected(void *data)
 }
 
 static void
-_create_cards(E_Dialog *dialog __UNUSED__, Evas *evas, E_Mixer_App_Dialog_Data *app)
+_create_cards(E_Dialog *dialog EINA_UNUSED, Evas *evas, E_Mixer_App_Dialog_Data *app)
 {
    struct e_mixer_app_ui_cards *ui = &app->ui.cards;
    const char *card;
@@ -353,7 +353,7 @@ _create_cards(E_Dialog *dialog __UNUSED__, Evas *evas, E_Mixer_App_Dialog_Data *
 }
 
 static void
-_create_channels(E_Dialog *dialog __UNUSED__, Evas *evas, E_Mixer_App_Dialog_Data *app)
+_create_channels(E_Dialog *dialog EINA_UNUSED, Evas *evas, E_Mixer_App_Dialog_Data *app)
 {
    struct e_mixer_app_ui_channels *ui = &app->ui.channels;
    ui->list = e_widget_ilist_add(evas, 24, 24, &app->channel_name);
diff --git a/src/modules/mixer/conf_gadget.c b/src/modules/mixer/conf_gadget.c
index b4151ebb89..7f57727644 100644
--- a/src/modules/mixer/conf_gadget.c
+++ b/src/modules/mixer/conf_gadget.c
@@ -186,7 +186,7 @@ _basic_apply(E_Config_Dialog *dialog, E_Config_Dialog_Data *cfdata)
 }
 
 static void
-_lock_change(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
+_lock_change(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
 {
    E_Config_Dialog_Data *cfdata = data;
    e_widget_disabled_set(cfdata->ui.general.show_locked, !cfdata->lock_sliders);
@@ -293,7 +293,7 @@ _basic_create_channels(Evas *evas, E_Config_Dialog_Data *cfdata)
 }
 
 static void
-_card_change(void *data, Evas_Object *obj, void *event __UNUSED__)
+_card_change(void *data, Evas_Object *obj, void *event EINA_UNUSED)
 {
    E_Config_Dialog_Data *cfdata = data;
    Evas *evas;
diff --git a/src/modules/mixer/conf_module.c b/src/modules/mixer/conf_module.c
index 1385ae5bca..e838be4a1a 100644
--- a/src/modules/mixer/conf_module.c
+++ b/src/modules/mixer/conf_module.c
@@ -144,14 +144,14 @@ _basic_create_general(E_Config_Dialog *dialog, Evas *evas, E_Config_Dialog_Data
 }
 
 static void
-cb_mixer_app_del(E_Dialog *dialog __UNUSED__, void *data)
+cb_mixer_app_del(E_Dialog *dialog EINA_UNUSED, void *data)
 {
    E_Mixer_Module_Context *ctxt = data;
    ctxt->mixer_dialog = NULL;
 }
 
 static void
-cb_mixer_call(void *data, void *data2 __UNUSED__)
+cb_mixer_call(void *data, void *data2 EINA_UNUSED)
 {
    Eina_List *l;
    E_Mixer_Module_Context *ctxt = data;
diff --git a/src/modules/mixer/e_mod_main.c b/src/modules/mixer/e_mod_main.c
index 26399453c2..5d28abfbbe 100644
--- a/src/modules/mixer/e_mod_main.c
+++ b/src/modules/mixer/e_mod_main.c
@@ -164,7 +164,7 @@ _mixer_gadget_configuration_free(E_Mixer_Module_Config *mod_conf, E_Mixer_Gadget
 }
 
 static Eina_Bool
-_mixer_gadget_configuration_free_foreach(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *hdata, void *fdata __UNUSED__)
+_mixer_gadget_configuration_free_foreach(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *hdata, void *fdata EINA_UNUSED)
 {
    _mixer_gadget_configuration_free_int(hdata);
    return 1;
@@ -319,7 +319,7 @@ _mixer_toggle_mute(E_Mixer_Instance *inst, Eina_Bool non_ui)
 }
 
 static void
-_mixer_popup_cb_volume_left_change(void *data, Evas_Object *obj, void *event __UNUSED__)
+_mixer_popup_cb_volume_left_change(void *data, Evas_Object *obj, void *event EINA_UNUSED)
 {
    E_Mixer_Instance *inst = data;
    E_Mixer_Channel_State *state = &inst->mixer_state;
@@ -341,7 +341,7 @@ _mixer_popup_cb_volume_left_change(void *data, Evas_Object *obj, void *event __U
 }
 
 static void
-_mixer_popup_cb_volume_right_change(void *data, Evas_Object *obj, void *event __UNUSED__)
+_mixer_popup_cb_volume_right_change(void *data, Evas_Object *obj, void *event EINA_UNUSED)
 {
    E_Mixer_Instance *inst = data;
    E_Mixer_Channel_State *state = &inst->mixer_state;
@@ -363,7 +363,7 @@ _mixer_popup_cb_volume_right_change(void *data, Evas_Object *obj, void *event __
 }
 
 static void
-_mixer_popup_cb_mute_change(void *data, Evas_Object *obj, void *event __UNUSED__)
+_mixer_popup_cb_mute_change(void *data, Evas_Object *obj, void *event EINA_UNUSED)
 {
    E_Mixer_Instance *inst = data;
    E_Mixer_Channel_State *state = &inst->mixer_state;
@@ -390,7 +390,7 @@ _mixer_popup_add_slider(E_Mixer_Instance *inst, int value, void (*cb)(void *data
 }
 
 static void
-_mixer_app_cb_del(E_Dialog *dialog __UNUSED__, void *data)
+_mixer_app_cb_del(E_Dialog *dialog EINA_UNUSED, void *data)
 {
    E_Mixer_Module_Context *ctxt = data;
    ctxt->mixer_dialog = NULL;
@@ -495,7 +495,7 @@ _mixer_app_select_current(E_Dialog *dialog, E_Mixer_Instance *inst)
 }
 
 static void
-_mixer_popup_cb_mixer(void *data, void *data2 __UNUSED__)
+_mixer_popup_cb_mixer(void *data, void *data2 EINA_UNUSED)
 {
    E_Mixer_Instance *inst = data;
    E_Mixer_Module_Context *ctxt;
@@ -647,7 +647,7 @@ _mixer_popup_timer_cb(void *data)
 }
 
 static void
-_mixer_menu_cb_cfg(void *data, E_Menu *menu __UNUSED__, E_Menu_Item *mi __UNUSED__)
+_mixer_menu_cb_cfg(void *data, E_Menu *menu EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED)
 {
    E_Mixer_Instance *inst = data;
 
@@ -682,7 +682,7 @@ _mixer_menu_new(E_Mixer_Instance *inst, Evas_Event_Mouse_Down *ev)
 }
 
 static void
-_mixer_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event)
+_mixer_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event)
 {
    E_Mixer_Instance *inst = data;
    Evas_Event_Mouse_Down *ev = event;
@@ -699,7 +699,7 @@ _mixer_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSE
 }
 
 static void
-_mixer_cb_mouse_wheel(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event)
+_mixer_cb_mouse_wheel(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event)
 {
    E_Mixer_Instance *inst = data;
    Evas_Event_Mouse_Wheel *ev = event;
@@ -749,7 +749,7 @@ _mixer_sys_setup(E_Mixer_Instance *inst)
 }
 
 static int
-_mixer_system_cb_update(void *data, E_Mixer_System *sys __UNUSED__)
+_mixer_system_cb_update(void *data, E_Mixer_System *sys EINA_UNUSED)
 {
    E_Mixer_Instance *inst = data;
    e_mod_mixer_state_get(inst->sys, inst->channel, &inst->mixer_state);
@@ -1053,20 +1053,20 @@ _gc_shutdown(E_Gadcon_Client *gcc)
 }
 
 static void
-_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
+_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient EINA_UNUSED)
 {
    e_gadcon_client_aspect_set(gcc, 16, 16);
    e_gadcon_client_min_size_set(gcc, 16, 16);
 }
 
 static const char *
-_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_label(const E_Gadcon_Client_Class *client_class EINA_UNUSED)
 {
    return (char *)_(_e_mixer_Name);
 }
 
 static Evas_Object *
-_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
+_gc_icon(const E_Gadcon_Client_Class *client_class EINA_UNUSED, Evas *evas)
 {
    Evas_Object *o = edje_object_add(evas);
    edje_object_file_set(o, e_mixer_theme_path(), "icon");
@@ -1074,7 +1074,7 @@ _gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 }
 
 static const char *
-_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_id_new(const E_Gadcon_Client_Class *client_class EINA_UNUSED)
 {
    E_Mixer_Module_Context *ctxt;
    Eina_List *instances;
@@ -1129,19 +1129,19 @@ _mixer_cb_volume_modify(Eina_Bool up)
 }
 
 static void
-_mixer_cb_volume_increase(E_Object *obj __UNUSED__, const char *params __UNUSED__)
+_mixer_cb_volume_increase(E_Object *obj EINA_UNUSED, const char *params EINA_UNUSED)
 {
    _mixer_cb_volume_modify(EINA_TRUE);
 }
 
 static void
-_mixer_cb_volume_decrease(E_Object *obj __UNUSED__, const char *params __UNUSED__)
+_mixer_cb_volume_decrease(E_Object *obj EINA_UNUSED, const char *params EINA_UNUSED)
 {
    _mixer_cb_volume_modify(EINA_FALSE);
 }
 
 static void
-_mixer_cb_volume_mute(E_Object *obj __UNUSED__, const char *params __UNUSED__)
+_mixer_cb_volume_mute(E_Object *obj EINA_UNUSED, const char *params EINA_UNUSED)
 {
    E_Mixer_Module_Context *ctxt;
 
@@ -1166,7 +1166,7 @@ _mixer_cb_volume_mute(E_Object *obj __UNUSED__, const char *params __UNUSED__)
 }
 
 static E_Config_Dialog *
-_mixer_module_config(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__)
+_mixer_module_config(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED)
 {
    E_Mixer_Module_Context *ctxt;
 
diff --git a/src/modules/mixer/pa.c b/src/modules/mixer/pa.c
index bf3405937f..18006ce8b8 100644
--- a/src/modules/mixer/pa.c
+++ b/src/modules/mixer/pa.c
@@ -19,7 +19,7 @@ Eina_Hash *pulse_sinks = NULL;
 Eina_Hash *pulse_sources = NULL;
 
 void
-pulse_fake_free(void *d __UNUSED__, void *d2 __UNUSED__)
+pulse_fake_free(void *d EINA_UNUSED, void *d2 EINA_UNUSED)
 {}
 
 static void
@@ -343,7 +343,7 @@ fdh_func(Pulse *conn, Ecore_Fd_Handler *fdh)
 }
 
 static Eina_Bool
-con(Pulse *conn, int type __UNUSED__, Ecore_Con_Event_Server_Add *ev)
+con(Pulse *conn, int type EINA_UNUSED, Ecore_Con_Event_Server_Add *ev)
 {
    int on = 1;
    int fd;
diff --git a/src/modules/mixer/pa.h b/src/modules/mixer/pa.h
index 1a07901523..552d1d301e 100644
--- a/src/modules/mixer/pa.h
+++ b/src/modules/mixer/pa.h
@@ -23,8 +23,8 @@
 # define STATEDIR "/var"
 #endif
 
-#ifndef __UNUSED__
-# define __UNUSED__ __attribute__((unused))
+#ifndef EINA_UNUSED
+# define EINA_UNUSED __attribute__((unused))
 #endif
 
 # ifdef EINTERN
@@ -552,7 +552,7 @@ void tag_finish(Pulse_Tag *tag);
 
 Eina_Bool deserialize_tag(Pulse *conn, PA_Commands command, Pulse_Tag *tag);
 
-void pulse_fake_free(void *d __UNUSED__, void *d2 __UNUSED__);
+void pulse_fake_free(void *d EINA_UNUSED, void *d2 EINA_UNUSED);
 void pulse_tag_free(Pulse_Tag *tag);
 
 void msg_recv_creds(Pulse *conn, Pulse_Tag *tag);
diff --git a/src/modules/mixer/serial.c b/src/modules/mixer/serial.c
index 99678c0ad2..20c04548dc 100644
--- a/src/modules/mixer/serial.c
+++ b/src/modules/mixer/serial.c
@@ -53,7 +53,7 @@ deserialize_sinks_watcher(Pulse *conn, Pulse_Tag *tag)
 }
 
 static Pulse_Sink *
-deserialize_sink(Pulse *conn __UNUSED__, Pulse_Tag *tag, Eina_Bool source)
+deserialize_sink(Pulse *conn EINA_UNUSED, Pulse_Tag *tag, Eina_Bool source)
 {
    Pulse_Sink *sink = NULL;
    Eina_Bool mute, exist;
diff --git a/src/modules/mixer/sys_alsa.c b/src/modules/mixer/sys_alsa.c
index fdd1eaf4e8..7afc75f8fc 100644
--- a/src/modules/mixer/sys_alsa.c
+++ b/src/modules/mixer/sys_alsa.c
@@ -131,7 +131,7 @@ _mixer_callback_del(const E_Mixer_System *self,
 }
 
 static int
-_mixer_callback_replace(const E_Mixer_System *self __UNUSED__,
+_mixer_callback_replace(const E_Mixer_System *self EINA_UNUSED,
                         struct e_mixer_callback_desc *desc,
                         int (*func)(void *data, E_Mixer_System *self),
                         void *data)
diff --git a/src/modules/mixer/sys_dummy.c b/src/modules/mixer/sys_dummy.c
index 79a26e051b..9d9f509148 100644
--- a/src/modules/mixer/sys_dummy.c
+++ b/src/modules/mixer/sys_dummy.c
@@ -22,12 +22,12 @@ e_mixer_system_new(const char *name)
 }
 
 void
-e_mixer_system_del(E_Mixer_System *self __UNUSED__)
+e_mixer_system_del(E_Mixer_System *self EINA_UNUSED)
 {
 }
 
 int
-e_mixer_system_callback_set(const E_Mixer_System *self __UNUSED__, int (*func)(void *data, E_Mixer_System *self) __UNUSED__, void *data __UNUSED__)
+e_mixer_system_callback_set(const E_Mixer_System *self EINA_UNUSED, int (*func)(void *data, E_Mixer_System *self) EINA_UNUSED, void *data EINA_UNUSED)
 {
    return 0;
 }
@@ -60,7 +60,7 @@ e_mixer_system_get_card_name(const char *card)
 }
 
 Eina_List *
-e_mixer_system_get_channels(const E_Mixer_System *self __UNUSED__)
+e_mixer_system_get_channels(const E_Mixer_System *self EINA_UNUSED)
 {
    E_Mixer_Channel_Info *ch_info;
 
@@ -75,7 +75,7 @@ e_mixer_system_get_channels(const E_Mixer_System *self __UNUSED__)
 }
 
 Eina_List *
-e_mixer_system_get_channel_names(const E_Mixer_System *self __UNUSED__)
+e_mixer_system_get_channel_names(const E_Mixer_System *self EINA_UNUSED)
 {
    _e_mixer_dummy_set();
 
@@ -83,7 +83,7 @@ e_mixer_system_get_channel_names(const E_Mixer_System *self __UNUSED__)
 }
 
 const char *
-e_mixer_system_get_default_channel_name(const E_Mixer_System *self __UNUSED__)
+e_mixer_system_get_default_channel_name(const E_Mixer_System *self EINA_UNUSED)
 {
    _e_mixer_dummy_set();
 
@@ -91,7 +91,7 @@ e_mixer_system_get_default_channel_name(const E_Mixer_System *self __UNUSED__)
 }
 
 E_Mixer_Channel_Info *
-e_mixer_system_get_channel_by_name(const E_Mixer_System *self __UNUSED__, const char *name)
+e_mixer_system_get_channel_by_name(const E_Mixer_System *self EINA_UNUSED, const char *name)
 {
    E_Mixer_Channel_Info *ch_info;
 
@@ -111,8 +111,8 @@ e_mixer_system_get_channel_by_name(const E_Mixer_System *self __UNUSED__, const
 }
 
 int
-e_mixer_system_get_volume(const E_Mixer_System *self __UNUSED__,
-                          const E_Mixer_Channel_Info *channel __UNUSED__,
+e_mixer_system_get_volume(const E_Mixer_System *self EINA_UNUSED,
+                          const E_Mixer_Channel_Info *channel EINA_UNUSED,
                           int *left, int *right)
 {
    if (left)
@@ -124,16 +124,16 @@ e_mixer_system_get_volume(const E_Mixer_System *self __UNUSED__,
 }
 
 int
-e_mixer_system_set_volume(const E_Mixer_System *self __UNUSED__,
-                          const E_Mixer_Channel_Info *channel __UNUSED__,
-                          int left __UNUSED__, int right __UNUSED__)
+e_mixer_system_set_volume(const E_Mixer_System *self EINA_UNUSED,
+                          const E_Mixer_Channel_Info *channel EINA_UNUSED,
+                          int left EINA_UNUSED, int right EINA_UNUSED)
 {
    return 0;
 }
 
 int
-e_mixer_system_get_mute(const E_Mixer_System *self __UNUSED__,
-                        const E_Mixer_Channel_Info *channel __UNUSED__,
+e_mixer_system_get_mute(const E_Mixer_System *self EINA_UNUSED,
+                        const E_Mixer_Channel_Info *channel EINA_UNUSED,
                         int *mute)
 {
    if (mute)
@@ -143,16 +143,16 @@ e_mixer_system_get_mute(const E_Mixer_System *self __UNUSED__,
 }
 
 int
-e_mixer_system_set_mute(const E_Mixer_System *self __UNUSED__,
-                        const E_Mixer_Channel_Info *channel __UNUSED__,
-                        int mute __UNUSED__)
+e_mixer_system_set_mute(const E_Mixer_System *self EINA_UNUSED,
+                        const E_Mixer_Channel_Info *channel EINA_UNUSED,
+                        int mute EINA_UNUSED)
 {
    return 0;
 }
 
 int
-e_mixer_system_get_state(const E_Mixer_System *self __UNUSED__,
-                         const E_Mixer_Channel_Info *channel __UNUSED__,
+e_mixer_system_get_state(const E_Mixer_System *self EINA_UNUSED,
+                         const E_Mixer_Channel_Info *channel EINA_UNUSED,
                          E_Mixer_Channel_State *state)
 {
    const E_Mixer_Channel_State def = {1, 0, 0};
diff --git a/src/modules/mixer/sys_pulse.c b/src/modules/mixer/sys_pulse.c
index 74ab3e841c..61e1adee3a 100644
--- a/src/modules/mixer/sys_pulse.c
+++ b/src/modules/mixer/sys_pulse.c
@@ -53,7 +53,7 @@ _pulse_not_started(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_Exe_Event
 }
 
 static void
-_pulse_info_get(Pulse *d __UNUSED__, int type __UNUSED__, Pulse_Server_Info *ev)
+_pulse_info_get(Pulse *d EINA_UNUSED, int type EINA_UNUSED, Pulse_Server_Info *ev)
 {
    Eina_List *l;
    Pulse_Sink *sink;
@@ -80,7 +80,7 @@ _pulse_update_timer(void *d EINA_UNUSED)
 }
 
 static Eina_Bool
-_pulse_update(Pulse *d __UNUSED__, int type __UNUSED__, Pulse_Sink *ev __UNUSED__)
+_pulse_update(Pulse *d EINA_UNUSED, int type EINA_UNUSED, Pulse_Sink *ev EINA_UNUSED)
 {
    Pulse_Tag_Id id;
 
@@ -93,7 +93,7 @@ _pulse_update(Pulse *d __UNUSED__, int type __UNUSED__, Pulse_Sink *ev __UNUSED_
 }
 
 static void
-_pulse_sinks_get(Pulse *p __UNUSED__, Pulse_Tag_Id id __UNUSED__, Eina_List *ev)
+_pulse_sinks_get(Pulse *p EINA_UNUSED, Pulse_Tag_Id id EINA_UNUSED, Eina_List *ev)
 {
    Eina_List *l;
    Pulse_Sink *sink;
@@ -128,7 +128,7 @@ _pulse_sinks_get(Pulse *p __UNUSED__, Pulse_Tag_Id id __UNUSED__, Eina_List *ev)
 }
 
 static void
-_pulse_sources_get(Pulse *p __UNUSED__, Pulse_Tag_Id id __UNUSED__, Eina_List *ev)
+_pulse_sources_get(Pulse *p EINA_UNUSED, Pulse_Tag_Id id EINA_UNUSED, Eina_List *ev)
 {
    eina_list_free(sources);
    sources = ev;
@@ -152,7 +152,7 @@ _pulse_sources_get(Pulse *p __UNUSED__, Pulse_Tag_Id id __UNUSED__, Eina_List *e
 }
 
 static Eina_Bool
-_pulse_connected(Pulse *d, int type __UNUSED__, Pulse *ev)
+_pulse_connected(Pulse *d, int type EINA_UNUSED, Pulse *ev)
 {
    Pulse_Tag_Id id;
    if (d != ev) return ECORE_CALLBACK_PASS_ON;
@@ -176,7 +176,7 @@ _pulse_connected(Pulse *d, int type __UNUSED__, Pulse *ev)
 }
 
 static Eina_Bool
-_pulse_disc_timer(void *d __UNUSED__)
+_pulse_disc_timer(void *d EINA_UNUSED)
 {
    disc_timer = NULL;
    if (disc_count < 5)
@@ -191,7 +191,7 @@ _pulse_disc_timer(void *d __UNUSED__)
 }
 
 static Eina_Bool
-_pulse_disconnected(Pulse *d, int type __UNUSED__, Pulse *ev)
+_pulse_disconnected(Pulse *d, int type EINA_UNUSED, Pulse *ev)
 {
    Pulse_Sink *sink;
 
@@ -290,7 +290,7 @@ _pulse_queue_process(const Eina_Hash *h EINA_UNUSED, const char *key,
 }
 
 static void
-_pulse_result_cb(Pulse *p __UNUSED__, Pulse_Tag_Id id, void *ev)
+_pulse_result_cb(Pulse *p EINA_UNUSED, Pulse_Tag_Id id, void *ev)
 {
    if (!ev) fprintf(stderr, "Command %u failed!\n", id);
    if (!update_count) return;
@@ -369,7 +369,7 @@ e_mixer_pulse_new(const char *name)
 }
 
 void
-e_mixer_pulse_del(E_Mixer_System *self __UNUSED__)
+e_mixer_pulse_del(E_Mixer_System *self EINA_UNUSED)
 {
 }
 
@@ -510,7 +510,7 @@ e_mixer_pulse_set_volume(const E_Mixer_System *self,
 
 int
 e_mixer_pulse_get_mute(const E_Mixer_System *self,
-                       const E_Mixer_Channel_Info *channel __UNUSED__, int *mute)
+                       const E_Mixer_Channel_Info *channel EINA_UNUSED, int *mute)
 {
    if (mute) *mute = pulse_sink_muted_get((void *)self);
    return 1;
@@ -518,7 +518,7 @@ e_mixer_pulse_get_mute(const E_Mixer_System *self,
 
 int
 e_mixer_pulse_set_mute(const E_Mixer_System *self,
-                       const E_Mixer_Channel_Info *channel __UNUSED__, int mute)
+                       const E_Mixer_Channel_Info *channel EINA_UNUSED, int mute)
 {
    uint32_t id;
    Eina_Bool source = EINA_FALSE;
diff --git a/src/modules/mixer/tag.c b/src/modules/mixer/tag.c
index 56d7207717..5bd424025b 100644
--- a/src/modules/mixer/tag.c
+++ b/src/modules/mixer/tag.c
@@ -197,7 +197,7 @@ tag_simple_init(Pulse *conn, Pulse_Tag *tag, uint32_t val, PA_Tag type)
 }
 
 static Eina_Bool
-tag_proplist_foreach(const Eina_Hash *h __UNUSED__, const char *key, const char *val, Pulse_Tag *tag)
+tag_proplist_foreach(const Eina_Hash *h EINA_UNUSED, const char *key, const char *val, Pulse_Tag *tag)
 {
    size_t size;