mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix C89_BUILD

Browse Source
This commit is contained in:
twinaphex 2016-11-20 14:48:00 +01:00
parent d7ec915e1a
commit 205e7cf272
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
menu/drivers/xmb.c
View File

@ -833,9 +833,10 @@ end:
static void xmb_update_thumbnail_path(void *data, unsigned i)
{
menu_entry_t entry;
char *tmp = NULL;
settings_t *settings = config_get_ptr();
xmb_handle_t *xmb = (xmb_handle_t*)data;
char *tmp = NULL;
char *scrub_char_pointer = NULL;
settings_t *settings = config_get_ptr();
xmb_handle_t *xmb = (xmb_handle_t*)data;
if (!xmb)
return;
@ -865,7 +866,6 @@ static void xmb_update_thumbnail_path(void *data, unsigned i)
* http://datomatic.no-intro.org/stuff/The%20Official%20No-Intro%20Convention%20(20071030).zip
* Replace these characters in the entry name with underscores
*/
char *scrub_char_pointer = NULL;
tmp = strdup(entry.path);
while((scrub_char_pointer = strpbrk(tmp, "&*/:`<>?\\|")))

6
menu/menu_event.c
View File

@ -185,6 +185,7 @@ void menu_event_keyboard_set(bool down, enum retro_key key)
unsigned menu_event(uint64_t input, uint64_t trigger_input)
{
unsigned menu_ok_btn, menu_cancel_btn;
menu_animation_ctx_delta_t delta;
float delta_time;
/* Used for key repeat */
@ -347,9 +348,10 @@ unsigned menu_event(uint64_t input, uint64_t trigger_input)
trigger_input = 0;
}
unsigned menu_ok_btn = settings->input.menu_swap_ok_cancel_buttons ?
menu_ok_btn = settings->input.menu_swap_ok_cancel_buttons ?
RETRO_DEVICE_ID_JOYPAD_A: RETRO_DEVICE_ID_JOYPAD_B;
unsigned menu_cancel_btn = settings->input.menu_swap_ok_cancel_buttons ?
menu_cancel_btn = settings->input.menu_swap_ok_cancel_buttons ?
RETRO_DEVICE_ID_JOYPAD_B: RETRO_DEVICE_ID_JOYPAD_A;
if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_UP))