mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-23 06:41:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6295 from fr500/master

Browse Source 
C89 build fixes
This commit is contained in:
Twinaphex 2018-02-13 03:24:19 +01:00 committed by GitHub
commit 6cc7d124c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tasks/task_content.c
View File

@ -244,7 +244,6 @@ static void content_load_init_wrap(
**/ **/
static bool content_load(content_ctx_info_t *info) static bool content_load(content_ctx_info_t *info)
{ {
RARCH_LOG("content_load\n");
unsigned i; unsigned i;
bool retval = true; bool retval = true;
int rarch_argc = 0; int rarch_argc = 0;
@ -1491,6 +1490,7 @@ static bool task_load_content_callback(content_ctx_info_t *content_info,
char *error_string = NULL; char *error_string = NULL;
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
rarch_system_info_t *sys_info = runloop_get_system_info();
struct string_list *content = NULL; struct string_list *content = NULL;
content_ctx.check_firmware_before_loading = settings->bools.check_firmware_before_loading; content_ctx.check_firmware_before_loading = settings->bools.check_firmware_before_loading;
@ -1512,7 +1512,6 @@ static bool task_load_content_callback(content_ctx_info_t *content_info,
content_ctx.subsystem.data = NULL; content_ctx.subsystem.data = NULL;
content_ctx.subsystem.size = 0; content_ctx.subsystem.size = 0;
rarch_system_info_t *sys_info = runloop_get_system_info();
if (sys_info) if (sys_info)
{ {
content_ctx.history_list_enable = settings->bools.history_list_enable; content_ctx.history_list_enable = settings->bools.history_list_enable;
@ -1739,9 +1738,10 @@ void content_get_status(
/* Clears the pending subsystem rom buffer*/ /* Clears the pending subsystem rom buffer*/
void content_clear_subsystem(void) void content_clear_subsystem(void)
{ {
int i;
pending_subsystem_rom_id = 0; pending_subsystem_rom_id = 0;
pending_subsystem_init = false; pending_subsystem_init = false;
for (int i = 0; i < RARCH_MAX_SUBSYSTEM_ROMS; i++) for (i = 0; i < RARCH_MAX_SUBSYSTEM_ROMS; i++)
pending_subsystem_roms[i][0] = '\0'; pending_subsystem_roms[i][0] = '\0';
} }
@ -1831,11 +1831,11 @@ void content_deinit(void)
/* Set environment variables before a subsystem load */ /* Set environment variables before a subsystem load */
void content_set_subsystem_info() void content_set_subsystem_info()
{ {
/* hardcoded to 2 for testing please fix */
char* roms[2] = { pending_subsystem_roms[0], pending_subsystem_roms[1] };
if (pending_subsystem_init) if (pending_subsystem_init)
{ {
path_set(RARCH_PATH_SUBSYSTEM, pending_subsystem_ident); path_set(RARCH_PATH_SUBSYSTEM, pending_subsystem_ident);
char* roms[2] = { pending_subsystem_roms[0], pending_subsystem_roms[1] };
/* hardcoded to 2 for testing please fix */
path_set_special(roms, pending_subsystem_rom_num); path_set_special(roms, pending_subsystem_rom_num);
} }
} }