From 169a2bf551295ad20aa9fbbdde9962ec2b86a05f Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Wed, 8 Nov 2017 22:47:53 +0200 Subject: [PATCH] SDL: fixed compilation with GCC toolchain --- project/jni/sdl-1.2/src/video/android/SDL_androidinput.c | 3 ++- project/jni/sdl-1.2/src/video/android/keymap.c | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c b/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c index f4a1b1273..98eb00c0c 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c +++ b/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c @@ -1764,7 +1764,8 @@ void SDL_ANDROID_SetIndividualGamepadKeymap(int GamepadId, void SDL_ANDROID_SetGamepadKeymap(int A, int B, int X, int Y, int L1, int R1, int L2, int R2, int LThumb, int RThumb) { - for( int i = 0; i < SDL_ANDROID_MAX_GAMEPADS; i++ ) + int i; + for( i = 0; i < SDL_ANDROID_MAX_GAMEPADS; i++ ) { SDL_ANDROID_SetIndividualGamepadKeymap(i, A, B, X, Y, L1, R1, L2, R2, LThumb, RThumb, 0, 0, 0, 0, 0, 0); } diff --git a/project/jni/sdl-1.2/src/video/android/keymap.c b/project/jni/sdl-1.2/src/video/android/keymap.c index 6fbe0d37a..8d7546b2b 100644 --- a/project/jni/sdl-1.2/src/video/android/keymap.c +++ b/project/jni/sdl-1.2/src/video/android/keymap.c @@ -259,9 +259,11 @@ void SDL_android_init_keymap(SDLKey *SDL_android_keymap) keymap[KEYCODE_MOUSE_X1] = SDL_KEY(MOUSE_X1); keymap[KEYCODE_MOUSE_X2] = SDL_KEY(MOUSE_X2); - for( int gamepadId = 0; gamepadId < SDL_ANDROID_MAX_GAMEPADS; gamepadId++ ) + int gamepadId; + for( gamepadId = 0; gamepadId < SDL_ANDROID_MAX_GAMEPADS; gamepadId++ ) { - for( int i = 0; i < KEYCODE_LAST+1; i++ ) + int i; + for( i = 0; i < KEYCODE_LAST+1; i++ ) { SDL_android_gamepad_keymap[gamepadId][i] = SDL_android_keymap[i]; }