Merge pull request #1398 from jeapostrophe/master

Fixing iOS build (non Theos?)
This commit is contained in:
Twinaphex 2015-02-08 16:01:41 +01:00
commit 598aa98202
2 changed files with 10 additions and 6 deletions

View File

@ -656,12 +656,15 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
cbs = (menu_file_list_cbs_t*)menu_list_get_actiondata_at_offset( cbs = (menu_file_list_cbs_t*)menu_list_get_actiondata_at_offset(
driver.menu->menu_list->selection_buf, i); driver.menu->menu_list->selection_buf, i);
disp_set_label if (cbs && cbs->action_get_representation) {
(driver.menu->menu_list->selection_buf, &w, type, i, label, cbs->action_get_representation
type_str, sizeof(type_str), (driver.menu->menu_list->selection_buf,
entry_label, path, &w, type, i, label,
path_buf, sizeof(path_buf)); type_str, sizeof(type_str),
entry_label, path,
path_buf, sizeof(path_buf));
}
if (setting && setting->type == ST_ACTION && if (setting && setting->type == ST_ACTION &&
setting->flags & SD_FLAG_BROWSER_ACTION && setting->flags & SD_FLAG_BROWSER_ACTION &&
setting->action_toggle && setting->action_toggle &&

View File

@ -18,6 +18,7 @@
#define __RARCH_SETTINGS_DATA_H__ #define __RARCH_SETTINGS_DATA_H__
#include <stdint.h> #include <stdint.h>
#include <file/file_list.h>
#include <file/config_file.h> #include <file/config_file.h>
#include <retro_miscellaneous.h> #include <retro_miscellaneous.h>
#include "settings_list.h" #include "settings_list.h"