From c1e6a955ddb40a6237858df1477ef083056a6a88 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 10 Jan 2015 06:26:34 +0100
Subject: [PATCH] Rename setting_handler to menu_action_setting_handler

---
 menu/menu_action.c      | 2 +-
 menu/menu_action.h      | 2 +-
 menu/menu_entries_cbs.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/menu/menu_action.c b/menu/menu_action.c
index bd4c0bca40..0c1e35684d 100644
--- a/menu/menu_action.c
+++ b/menu/menu_action.c
@@ -67,7 +67,7 @@ static void process_setting_handler(
    }
 }
 
-int setting_handler(
+int menu_action_setting_handler(
       rarch_setting_t *setting, unsigned action)
 {
    process_setting_handler(setting, action);
diff --git a/menu/menu_action.h b/menu/menu_action.h
index 593cec2b2e..d558ced5d0 100644
--- a/menu/menu_action.h
+++ b/menu/menu_action.h
@@ -23,7 +23,7 @@
 extern "C" {
 #endif
 
-int setting_handler(
+int menu_action_setting_handler(
       rarch_setting_t *setting, unsigned action);
 
 int menu_action_setting_set_current_string(
diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c
index 43c526e8ee..12654d36b9 100644
--- a/menu/menu_entries_cbs.c
+++ b/menu/menu_entries_cbs.c
@@ -1275,7 +1275,7 @@ static int action_toggle_shader_filter_default(unsigned type, const char *label,
    rarch_setting_t *current_setting = NULL;
    if ((current_setting = setting_data_find_setting(
                driver.menu->list_settings, "video_smooth")))
-      setting_handler(current_setting, action);
+      menu_action_setting_handler(current_setting, action);
 #endif
    return 0;
 }