ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- use MIN macro instead of min for portability 

- remove unused variable
This commit is contained in:
Twinaphex 2019-12-25 08:31:18 +01:00
parent 65cddce865
commit e52daa8602
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
menu/menu_displaylist.c
View File

@ -4340,7 +4340,6 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct
case DISPLAYLIST_OPTIONS_REMAPPINGS: case DISPLAYLIST_OPTIONS_REMAPPINGS:
{ {
unsigned p; unsigned p;
settings_t *settings = config_get_ptr();
unsigned max_users = *(input_driver_get_uint(INPUT_ACTION_MAX_USERS)); unsigned max_users = *(input_driver_get_uint(INPUT_ACTION_MAX_USERS));
if (menu_entries_append_enum(list, if (menu_entries_append_enum(list,

2
retroarch.c
View File

@ -13662,7 +13662,7 @@ static int16_t input_state_device(
RETRO_DEVICE_ID_JOYPAD_L3, RETRO_DEVICE_ID_JOYPAD_L3,
RETRO_DEVICE_ID_JOYPAD_R3}; RETRO_DEVICE_ID_JOYPAD_R3};
input_driver_turbo_btns.enable[port] = 1 << button_map[ input_driver_turbo_btns.enable[port] = 1 << button_map[
min( MIN(
sizeof(button_map)/sizeof(button_map[0])-1, sizeof(button_map)/sizeof(button_map[0])-1,
settings->uints.input_turbo_default_button)]; settings->uints.input_turbo_default_button)];
} }