From 3cfab5ab8858f096c1e99af86f348bd78b3af78d Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 9 Nov 2021 17:07:10 +0100 Subject: [PATCH] Fix symbol conflict with quasi88 --- configuration.c | 4 ++-- configuration.h | 4 ++-- retroarch.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configuration.c b/configuration.c index 3e3952851f..453c670786 100644 --- a/configuration.c +++ b/configuration.c @@ -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; diff --git a/configuration.h b/configuration.h index 898f2af8f2..0e4afb6c7a 100644 --- a/configuration.h +++ b/configuration.h @@ -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); diff --git a/retroarch.c b/retroarch.c index 44ace29a4c..f33f0f1bcf 100644 --- a/retroarch.c +++ b/retroarch.c @@ -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);