From 0fb301fa43def71625ceeeb48c11dd1a016cd8c1 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 20 Oct 2014 20:32:41 +0200
Subject: [PATCH] (joypad/connect) Change 'index' local variables

---
 input/connect/connect_ps3.c       |  6 +++---
 input/connect/connect_ps4.c       |  6 +++---
 input/connect/joypad_connection.c |  2 +-
 input/connect/joypad_connection.h | 10 +++++-----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/input/connect/connect_ps3.c b/input/connect/connect_ps3.c
index 1ccec9174f..4fe1bc7743 100644
--- a/input/connect/connect_ps3.c
+++ b/input/connect/connect_ps3.c
@@ -165,11 +165,11 @@ static void hidpad_ps3_set_rumble(void *data,
    enum retro_rumble_effect effect, uint16_t strength)
 {
    struct hidpad_ps3_data *device = (struct hidpad_ps3_data*)data;
-   unsigned index = (effect == RETRO_RUMBLE_STRONG) ? 0 : 1;
+   unsigned idx = (effect == RETRO_RUMBLE_STRONG) ? 0 : 1;
 
-   if (device && (device->motors[index] != strength))
+   if (device && (device->motors[idx] != strength))
    {
-      device->motors[index] = strength;
+      device->motors[idx] = strength;
       hidpad_ps3_send_control(device);
    }
 }
diff --git a/input/connect/connect_ps4.c b/input/connect/connect_ps4.c
index fa7b30c883..ad383fc9ef 100644
--- a/input/connect/connect_ps4.c
+++ b/input/connect/connect_ps4.c
@@ -168,11 +168,11 @@ static void hidpad_ps4_set_rumble(void *data,
    /* TODO */
 #if 0
    struct hidpad_ps4_data *device = (struct hidpad_ps4_data*)data;
-   unsigned index = (effect == RETRO_RUMBLE_STRONG) ? 0 : 1;
+   unsigned idx = (effect == RETRO_RUMBLE_STRONG) ? 0 : 1;
 
-   if (device && (device->motors[index] != strength))
+   if (device && (device->motors[idx] != strength))
    {
-      device->motors[index] = strength;
+      device->motors[idx] = strength;
       hidpad_ps4_send_control(device);
    }
 #endif
diff --git a/input/connect/joypad_connection.c b/input/connect/joypad_connection.c
index 6c72fc6d29..3bdfeb74c3 100644
--- a/input/connect/joypad_connection.c
+++ b/input/connect/joypad_connection.c
@@ -141,7 +141,7 @@ uint32_t pad_connection_get_buttons(joypad_connection_t *s, unsigned pad)
 }
 
 int16_t pad_connection_get_axis(joypad_connection_t *s,
-   unsigned index, unsigned i)
+   unsigned idx, unsigned i)
 {
    if (s->iface)
       return s->iface->get_axis(s->data, i);
diff --git a/input/connect/joypad_connection.h b/input/connect/joypad_connection.h
index 3c41fe31e1..d0695427ec 100644
--- a/input/connect/joypad_connection.h
+++ b/input/connect/joypad_connection.h
@@ -56,22 +56,22 @@ void *pad_connection_init(unsigned pads);
 void pad_connection_destroy(joypad_connection_t *joyconn);
 
 void pad_connection_disconnect(joypad_connection_t *joyconn,
-   unsigned index);
+   unsigned idx);
 
 void pad_connection_packet(joypad_connection_t *joyconn,
-   unsigned index, uint8_t* data, uint32_t length);
+   unsigned idx, uint8_t* data, uint32_t length);
 
 uint32_t pad_connection_get_buttons(joypad_connection_t *joyconn,
-   unsigned index);
+   unsigned idx);
 
 int16_t pad_connection_get_axis(joypad_connection_t *joyconn,
-   unsigned index, unsigned i);
+   unsigned idx, unsigned i);
 
 /* Determine if connected joypad is a hidpad backed device.
  * If false, pad_connection_packet cannot be used */
 
 bool pad_connection_has_interface(joypad_connection_t *joyconn,
-   unsigned index);
+   unsigned idx);
 
 bool pad_connection_rumble(joypad_connection_t *s,
    unsigned pad, enum retro_rumble_effect effect, uint16_t strength);