kmx git

Commit dddd6a5a9a662d3b10133a29ac263f8fe3f1577d

2016-02-19T00:28:53

Android: Restored Philipp's joystick change, lost in the previous merge. This patch, specifically: https://hg.libsdl.org/SDL/rev/c0976de9c332

diff --git a/src/joystick/android/SDL_sysjoystick.c b/src/joystick/android/SDL_sysjoystick.c
index 25c00ed..6ef16a9 100644
--- a/src/joystick/android/SDL_sysjoystick.c
+++ b/src/joystick/android/SDL_sysjoystick.c
@@ -323,7 +323,6 @@ Android_RemoveJoystick(int device_id)
 {
     SDL_joylist_item *item = SDL_joylist;
     SDL_joylist_item *prev = NULL;
-    int retval;
 #if !SDL_EVENTS_DISABLED
     SDL_Event event;
 #endif
@@ -341,7 +340,6 @@ Android_RemoveJoystick(int device_id)
         return -1;
     }
 
-    retval = item->device_instance;
     if (item->joystick) {
         item->joystick->hwdata = NULL;
     }

kc3-lang/SDL

Commit dddd6a5a9a662d3b10133a29ac263f8fe3f1577d