CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-24 19:56:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(OSX) Change 'index' to 'idx' to avoid declaration of index shadows a global

Browse Source 
declaration on OSX 10.6
This commit is contained in:
twinaphex 2014-10-20 03:56:31 +02:00
parent 6cf27702b0
commit dd79cf0b93
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
input/input_common.c
View File

@ -189,7 +189,7 @@ bool input_joypad_pressed(const rarch_joypad_driver_t *drv,
}
int16_t input_joypad_analog(const rarch_joypad_driver_t *drv,
unsigned port, unsigned index, unsigned id,
unsigned port, unsigned idx, unsigned id,
const struct retro_keybind *binds)
{
if (!drv)
@ -205,7 +205,7 @@ int16_t input_joypad_analog(const rarch_joypad_driver_t *drv,
unsigned id_minus = 0;
unsigned id_plus = 0;
input_conv_analog_id_to_bind_id(index, id, &id_minus, &id_plus);
input_conv_analog_id_to_bind_id(idx, id, &id_minus, &id_plus);
const struct retro_keybind *bind_minus = &binds[id_minus];
const struct retro_keybind *bind_plus = &binds[id_plus];

6
input/input_common.h
View File

@ -28,10 +28,10 @@ extern "C" {
typedef uint64_t retro_input_t ;
static inline void input_conv_analog_id_to_bind_id(unsigned index, unsigned id,
static inline void input_conv_analog_id_to_bind_id(unsigned idx, unsigned id,
unsigned *id_minus, unsigned *id_plus)
{
switch ((index << 1) | id)
switch ((idx << 1) | id)
{
case (RETRO_DEVICE_INDEX_ANALOG_LEFT << 1) | RETRO_DEVICE_ID_ANALOG_X:
*id_minus = RARCH_ANALOG_LEFT_X_MINUS;
@ -109,7 +109,7 @@ bool input_joypad_pressed(const rarch_joypad_driver_t *driver,
unsigned port, const struct retro_keybind *binds, unsigned key);
int16_t input_joypad_analog(const rarch_joypad_driver_t *driver,
unsigned port, unsigned index, unsigned id,
unsigned port, unsigned idx, unsigned id,
const struct retro_keybind *binds);
bool input_joypad_set_rumble(const rarch_joypad_driver_t *driver,