From 9e8d5d05cf388548eebb32e268cdbe93b9e3ac81 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 27 Sep 2013 21:05:51 +0200 Subject: [PATCH] Rename directory_parse to rgui_directory_parse to avoid namespace conlict --- frontend/menu/rgui.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/menu/rgui.c b/frontend/menu/rgui.c index 74a68c5fb5..0a8538dc30 100644 --- a/frontend/menu/rgui.c +++ b/frontend/menu/rgui.c @@ -2558,7 +2558,7 @@ static void history_parse(rgui_handle_t *rgui) } } -static bool directory_parse(rgui_handle_t *rgui, const char *directory, unsigned menu_type, void *ctx) +static bool rgui_directory_parse(rgui_handle_t *rgui, const char *directory, unsigned menu_type, void *ctx) { if (!*directory) { @@ -2970,7 +2970,7 @@ static int rgui_iterate(void *data, unsigned action) if (menu_type == RGUI_SETTINGS_OPEN_HISTORY) history_parse(rgui); else - directory_parse(rgui, dir, menu_type, rgui->selection_buf); + rgui_directory_parse(rgui, dir, menu_type, rgui->selection_buf); // Before a refresh, we could have deleted a file on disk, causing // selection_ptr to suddendly be out of range. Ensure it doesn't overflow.