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

Prevent collision with quasi88 in statically linked cores

Browse Source
This commit is contained in:
twinaphex 2021-09-03 21:29:38 +02:00
parent 8adc24ecbc
commit 19f4504943
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
menu/menu_driver.c
View File

@ -2140,15 +2140,7 @@ bool generic_menu_init_list(struct menu_state *menu_st,
return true; return true;
} }
/** bool rarch_menu_init(
* menu_init:
* @data : Menu context handle.
*
* Create and initialize menu handle.
*
* Returns: menu handle on success, otherwise NULL.
**/
bool menu_init(
struct menu_state *menu_st, struct menu_state *menu_st,
menu_dialog_t *p_dialog, menu_dialog_t *p_dialog,
const menu_ctx_driver_t *menu_driver_ctx, const menu_ctx_driver_t *menu_driver_ctx,

2
menu/menu_driver.h
View File

@ -767,7 +767,7 @@ void menu_driver_get_last_shader_path_int(
bool generic_menu_init_list(struct menu_state *menu_st, bool generic_menu_init_list(struct menu_state *menu_st,
settings_t *settings); settings_t *settings);
bool menu_init( bool rarch_menu_init(
struct menu_state *menu_st, struct menu_state *menu_st,
menu_dialog_t *p_dialog, menu_dialog_t *p_dialog,
const menu_ctx_driver_t *menu_driver_ctx, const menu_ctx_driver_t *menu_driver_ctx,

2
retroarch.c
View File

@ -3451,7 +3451,7 @@ static bool menu_driver_init_internal(
} }
} }
if (!p_rarch->menu_driver_data || !menu_init( if (!p_rarch->menu_driver_data || !rarch_menu_init(
menu_st, menu_st,
&p_rarch->dialog_st, &p_rarch->dialog_st,
p_rarch->menu_driver_ctx, p_rarch->menu_driver_ctx,