encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Android: Changed return type of four JNI functions from int to jint.

This commit is contained in:
Philipp Wiesemann 2015-09-05 20:21:52 +02:00
parent a4a5483faf
commit e8757e873e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/android/SDL_android.c
View File

@ -160,7 +160,7 @@ JNIEXPORT void JNICALL Java_org_libsdl_app_SDLActivity_onNativeResize(
} }
/* Paddown */ /* Paddown */
JNIEXPORT int JNICALL Java_org_libsdl_app_SDLActivity_onNativePadDown( JNIEXPORT jint JNICALL Java_org_libsdl_app_SDLActivity_onNativePadDown(
JNIEnv* env, jclass jcls, JNIEnv* env, jclass jcls,
jint device_id, jint keycode) jint device_id, jint keycode)
{ {
@ -168,7 +168,7 @@ JNIEXPORT int JNICALL Java_org_libsdl_app_SDLActivity_onNativePadDown(
} }
/* Padup */ /* Padup */
JNIEXPORT int JNICALL Java_org_libsdl_app_SDLActivity_onNativePadUp( JNIEXPORT jint JNICALL Java_org_libsdl_app_SDLActivity_onNativePadUp(
JNIEnv* env, jclass jcls, JNIEnv* env, jclass jcls,
jint device_id, jint keycode) jint device_id, jint keycode)
{ {
@ -192,7 +192,7 @@ JNIEXPORT void JNICALL Java_org_libsdl_app_SDLActivity_onNativeHat(
} }
JNIEXPORT int JNICALL Java_org_libsdl_app_SDLActivity_nativeAddJoystick( JNIEXPORT jint JNICALL Java_org_libsdl_app_SDLActivity_nativeAddJoystick(
JNIEnv* env, jclass jcls, JNIEnv* env, jclass jcls,
jint device_id, jstring device_name, jint is_accelerometer, jint device_id, jstring device_name, jint is_accelerometer,
jint nbuttons, jint naxes, jint nhats, jint nballs) jint nbuttons, jint naxes, jint nhats, jint nballs)
@ -207,7 +207,7 @@ JNIEXPORT int JNICALL Java_org_libsdl_app_SDLActivity_nativeAddJoystick(
return retval; return retval;
} }
JNIEXPORT int JNICALL Java_org_libsdl_app_SDLActivity_nativeRemoveJoystick( JNIEXPORT jint JNICALL Java_org_libsdl_app_SDLActivity_nativeRemoveJoystick(
JNIEnv* env, jclass jcls, jint device_id) JNIEnv* env, jclass jcls, jint device_id)
{ {
return Android_RemoveJoystick(device_id); return Android_RemoveJoystick(device_id);