mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

input_state_wrapper symbol name was causing collisions with certain

Browse Source 
cores on statically linked platforms
This commit is contained in:
twinaphex 2021-10-08 12:50:45 +02:00
parent e39bc07e31
commit 3d710db798
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
input/input_driver.c
View File

@ -4741,7 +4741,7 @@ int16_t input_state_internal(unsigned port, unsigned device,
return result;
}
int16_t input_state_wrapper(unsigned port, unsigned device,
int16_t input_driver_state_wrapper(unsigned port, unsigned device,
unsigned idx, unsigned id)
{
input_driver_state_t

2
input/input_driver.h
View File

@ -1006,7 +1006,7 @@ void input_driver_poll(void);
* Returns: Non-zero if the given key (identified by @id)
* was pressed by the user (assigned to @port).
**/
int16_t input_state_wrapper(unsigned port, unsigned device,
int16_t input_driver_state_wrapper(unsigned port, unsigned device,
unsigned idx, unsigned id);
extern input_device_driver_t *joypad_drivers[];

4
retroarch.c
View File

@ -25724,7 +25724,7 @@ static int16_t core_input_state_poll_late(unsigned port,
input_driver_poll();
p_rarch->current_core.input_polled = true;
return input_state_wrapper(port, device, idx, id);
return input_driver_state_wrapper(port, device, idx, id);
}
static retro_input_state_t core_input_state_poll_return_cb(void)
@ -25737,7 +25737,7 @@ static retro_input_state_t core_input_state_poll_return_cb(void)
: p_rarch->current_core.poll_type;
if (new_poll_type == POLL_TYPE_LATE)
return core_input_state_poll_late;
return input_state_wrapper;
return input_driver_state_wrapper;
}
static void core_input_state_poll_maybe(void)