kc3-lang/SDL/src

• Show log

  Commit

• Hash : b970dd1b
  Author :
  Date : 2023-03-25T20:52:15
  

  Android: Fix mismatching JNI method signature Another regression from commit dca3fd8307c2c9ebda8d8ea623bbbf19649f5e22, which was a backport of commit de3909a190f6e1a3f11776ce42927f99b0381675 from SDL3 to SDL2. This time the regression is much less apparent, however, due to two reasons: - It only appears when the SDL project is ran on an actual device due to magic stringage. - More importantly, the regression was partially hidden due to the nature of de3909a190f6e1a3f11776ce42927f99b0381675. The commit which was backported added a single `I` to the JNI method signature in `SDL_android.c`, representing the added `int axis_mask` parameter. The parameter was added to both SDL2 and SDL3. However, notably, that `I` was added *after* commit fcafe40948fe308cc9552df5a3d625ee2725de5a, which removed the `int nballs` parameter from the joystick API, but only from the SDL3 branch. Therefore, in totality, what should really have been a merge conflict, was obscured by the fact that the SDL3 branch ended up having a net-identical JNI signature to the SDL2 branch, due to having one bool param removed and one added - while, in fact, the SDL2 branch needed one bool param added and none removed.

• Files

• SDL.c
• SDL_assert.c
• SDL_assert_c.h
• SDL_dataqueue.c
• SDL_dataqueue.h
• SDL_error.c
• SDL_error_c.h
• SDL_guid.c
• SDL_hints.c
• SDL_hints_c.h
• SDL_internal.h
• SDL_list.c
• SDL_list.h
• SDL_log.c
• SDL_log_c.h
• SDL_utils.c
• SDL_utils_c.h
• atomic/
• audio/
• core/
• cpuinfo/
• dynapi/
• events/
• file/
• filesystem/
• haptic/
• hidapi/
• joystick/
• libm/
• loadso/
• locale/
• main/
• misc/
• power/
• render/
• sensor/
• stdlib/
• test/
• thread/
• timer/
• video/

• Properties

• Git HTTP	https://git.kmx.io/kc3-lang/SDL.git
  Git SSH	git@git.kmx.io:kc3-lang/SDL.git
  Public access ?	public
  Description	Fork of https://github.com/libsdl-org/SDL
  Users
  Tags