mirror of
https://github.com/libretro/RetroArch.git
synced 2024-11-27 18:20:27 +00:00
Fix symbol conflict with quasi88
This commit is contained in:
parent
d6c25f153f
commit
3cfab5ab88
@ -5722,14 +5722,14 @@ void input_config_parse_joy_button(
|
||||
}
|
||||
}
|
||||
|
||||
void config_deinit(void)
|
||||
void rarch_config_deinit(void)
|
||||
{
|
||||
if (config_st)
|
||||
free(config_st);
|
||||
config_st = NULL;
|
||||
}
|
||||
|
||||
void config_init(void)
|
||||
void rarch_config_init(void)
|
||||
{
|
||||
if (config_st)
|
||||
return;
|
||||
|
@ -1083,9 +1083,9 @@ void config_load_file_salamander(void);
|
||||
void config_save_file_salamander(void);
|
||||
#endif
|
||||
|
||||
void config_init(void);
|
||||
void rarch_config_init(void);
|
||||
|
||||
void config_deinit(void);
|
||||
void rarch_config_deinit(void);
|
||||
|
||||
settings_t *config_get_ptr(void);
|
||||
|
||||
|
@ -5940,7 +5940,7 @@ void main_exit(void *args)
|
||||
global_free(p_rarch);
|
||||
task_queue_deinit();
|
||||
|
||||
config_deinit();
|
||||
rarch_config_deinit();
|
||||
|
||||
ui_companion_driver_deinit(p_rarch);
|
||||
|
||||
@ -6008,7 +6008,7 @@ int rarch_main(int argc, char *argv[], void *data)
|
||||
command_event(CMD_EVENT_HISTORY_DEINIT, NULL);
|
||||
rarch_favorites_deinit();
|
||||
|
||||
config_init();
|
||||
rarch_config_init();
|
||||
|
||||
retroarch_deinit_drivers(&runloop_st->retro_ctx);
|
||||
retroarch_ctl(RARCH_CTL_STATE_FREE, NULL);
|
||||
|
Loading…
Reference in New Issue
Block a user