CXX_BUILD fixes

mme4crt · Oct 2, 2017 · 8d850dc · 8d850dc
1 parent 9c639ec
commit 8d850dc
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 10 deletions.
diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c
@@ -210,7 +210,7 @@ static int action_left_mainmenu(unsigned type, const char *label,
             file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0);
             size_t selection           = menu_navigation_get_selection();
             menu_file_list_cbs_t *cbs  = selection_buf ?
-               file_list_get_actiondata_at_offset(selection_buf,
+               (menu_file_list_cbs_t*)file_list_get_actiondata_at_offset(selection_buf,
                      selection) : NULL;
 
             list_info.type             = MENU_LIST_HORIZONTAL;

diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c
@@ -191,7 +191,8 @@ static int action_right_goto_tab(void)
    file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0);
    file_list_t *menu_stack    = menu_entries_get_menu_stack_ptr(0);
    size_t selection           = menu_navigation_get_selection();
-   menu_file_list_cbs_t *cbs  = selection_buf ? file_list_get_actiondata_at_offset(selection_buf, selection) : NULL;
+   menu_file_list_cbs_t *cbs  = selection_buf ? (menu_file_list_cbs_t*)
+	   file_list_get_actiondata_at_offset(selection_buf, selection) : NULL;
 
    list_info.type             = MENU_LIST_HORIZONTAL;
    list_info.action           = MENU_ACTION_RIGHT;

diff --git a/menu/cbs/menu_cbs_select.c b/menu/cbs/menu_cbs_select.c
@@ -42,7 +42,7 @@ static int action_select_default(const char *path, const char *label, unsigned t
    menu_entry_init(&entry);
    menu_entry_get(&entry, 0, idx, NULL, false);
 
-   cbs = selection_buf ? file_list_get_actiondata_at_offset(selection_buf, idx) : NULL;
+   cbs = selection_buf ? (menu_file_list_cbs_t*)file_list_get_actiondata_at_offset(selection_buf, idx) : NULL;
 
    if (!cbs)
    {

diff --git a/menu/drivers/menu_generic.c b/menu/drivers/menu_generic.c
@@ -134,7 +134,8 @@ int generic_menu_iterate(void *data, void *userdata, enum menu_action action)
          {
             file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0);
             menu_file_list_cbs_t *cbs  = selection_buf ?
-               file_list_get_actiondata_at_offset(selection_buf, selection) 
+               (menu_file_list_cbs_t*)
+			   file_list_get_actiondata_at_offset(selection_buf, selection) 
                : NULL;
 
             if (cbs->enum_idx != MSG_UNKNOWN)

diff --git a/menu/menu_entries.c b/menu/menu_entries.c
@@ -495,7 +495,7 @@ rarch_setting_t *menu_entries_get_setting(uint32_t i)
 {
    file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0);
    menu_file_list_cbs_t *cbs  = selection_buf ?
-      file_list_get_actiondata_at_offset(selection_buf, i) : NULL;
+      (menu_file_list_cbs_t*)file_list_get_actiondata_at_offset(selection_buf, i) : NULL;
 
    if (!cbs)
       return NULL;

diff --git a/menu/menu_input.c b/menu/menu_input.c
@@ -567,7 +567,7 @@ void menu_input_post_iterate(int *ret, unsigned action)
    file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0);
    size_t selection           = menu_navigation_get_selection();
    menu_file_list_cbs_t *cbs  = selection_buf ? 
-      file_list_get_actiondata_at_offset(selection_buf, selection) : NULL;
+      (menu_file_list_cbs_t*)file_list_get_actiondata_at_offset(selection_buf, selection) : NULL;
 
    menu_entry_init(&entry);
    menu_entry_get(&entry, 0, selection, NULL, false);

diff --git a/menu/menu_setting.c b/menu/menu_setting.c
@@ -917,7 +917,7 @@ int menu_setting_set(unsigned type, const char *label,
    file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0);
    size_t selection           = menu_navigation_get_selection();
    menu_file_list_cbs_t *cbs  = selection_buf ? 
-      file_list_get_actiondata_at_offset(selection_buf, selection) : NULL;
+      (menu_file_list_cbs_t*)file_list_get_actiondata_at_offset(selection_buf, selection) : NULL;
 
    if (!cbs)
       return 0;

diff --git a/menu/widgets/menu_entry.c b/menu/widgets/menu_entry.c
@@ -313,7 +313,7 @@ void menu_entry_get(menu_entry_t *entry, size_t stack_idx,
    menu_entries_get_at_offset(list, i, &path, &entry_label, &entry->type,
          &entry->entry_idx, NULL);
 
-   cbs = list ? file_list_get_actiondata_at_offset(list, i) : NULL;
+   cbs = list ? (menu_file_list_cbs_t*)file_list_get_actiondata_at_offset(list, i) : NULL;
 
    if (cbs)
    {
@@ -418,7 +418,7 @@ int menu_entry_action(menu_entry_t *entry, unsigned i, enum menu_action action)
    file_list_t *selection_buf = 
       menu_entries_get_selection_buf_ptr(0);
    menu_file_list_cbs_t *cbs  = selection_buf ?
-      file_list_get_actiondata_at_offset(selection_buf, i) : NULL;
+      (menu_file_list_cbs_t*)file_list_get_actiondata_at_offset(selection_buf, i) : NULL;
 
    switch (action)
    {
@@ -482,7 +482,7 @@ int menu_entry_action(menu_entry_t *entry, unsigned i, enum menu_action action)
          break;
    }
 
-   cbs = selection_buf ? file_list_get_actiondata_at_offset(selection_buf, i) : NULL;
+   cbs = selection_buf ? (menu_file_list_cbs_t*)file_list_get_actiondata_at_offset(selection_buf, i) : NULL;
 
    if (menu_entries_ctl(MENU_ENTRIES_CTL_NEEDS_REFRESH, NULL))
    {