Mercurial > sdl-ios-xcode
diff src/events/SDL_events.c @ 4729:1f7ad083fd3c
Merged Paul's Google Summer of Code work from SDL-gsoc2010_android
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Sun, 22 Aug 2010 12:23:55 -0700 |
| parents | eed063a0bf5b 52697090c967 |
| children | e8916fe9cfc8 |
line wrap: on
line diff
--- a/src/events/SDL_events.c Sun Aug 22 12:07:55 2010 -0700 +++ b/src/events/SDL_events.c Sun Aug 22 12:23:55 2010 -0700 @@ -92,11 +92,13 @@ static __inline__ SDL_bool SDL_ShouldPollJoystick() { +#if !SDL_JOYSTICK_DISABLED if (SDL_numjoysticks && (!SDL_disabled_events[SDL_JOYAXISMOTION >> 8] || SDL_JoystickEventState(SDL_QUERY))) { return SDL_TRUE; } +#endif return SDL_FALSE; }