Debian patch: 218_joystick_memmove.diff

--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%404031
This commit is contained in:
Sam Lantinga 2009-10-10 10:01:38 +00:00
parent dd4a6eaa0d
commit 826b5d2690

View file

@ -376,7 +376,7 @@ void SDL_JoystickClose(SDL_Joystick *joystick)
/* Remove joystick from list */ /* Remove joystick from list */
for ( i=0; SDL_joysticks[i]; ++i ) { for ( i=0; SDL_joysticks[i]; ++i ) {
if ( joystick == SDL_joysticks[i] ) { if ( joystick == SDL_joysticks[i] ) {
SDL_memcpy(&SDL_joysticks[i], &SDL_joysticks[i+1], SDL_memmove(&SDL_joysticks[i], &SDL_joysticks[i+1],
(SDL_numjoysticks-i)*sizeof(joystick)); (SDL_numjoysticks-i)*sizeof(joystick));
break; break;
} }