Mercurial > sdl-ios-xcode
diff src/joystick/linux/SDL_sysjoystick.c @ 1659:14717b52abc0 SDL-1.3
Merge trunk-1.3-3
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Wed, 17 May 2006 08:18:28 +0000 |
| parents | 92947e3a18db |
| children | 782fd950bd46 |
line wrap: on
line diff
--- a/src/joystick/linux/SDL_sysjoystick.c Mon May 01 06:58:33 2006 +0000 +++ b/src/joystick/linux/SDL_sysjoystick.c Wed May 17 08:18:28 2006 +0000 @@ -30,9 +30,6 @@ #include <fcntl.h> #include <sys/ioctl.h> #include <limits.h> /* For the definition of PATH_MAX */ -#ifdef __arm__ -#include <linux/limits.h> /* Arm cross-compiler needs this */ -#endif #include <linux/joystick.h> #if SDL_INPUT_LINUXEV #include <linux/input.h> @@ -980,7 +977,8 @@ #ifndef NO_LOGICAL_JOYSTICKS if (SDL_joylist[joystick->index].fname == NULL) { SDL_joylist_head(i, joystick->index); - return JS_HandleEvents(SDL_joylist[i].joy); + JS_HandleEvents(SDL_joylist[i].joy); + return; } #endif