Mercurial > sdl-ios-xcode

comparison src/events/SDL_events.c @ 4729:1f7ad083fd3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
4694:c24ba2cc9583 4729:1f7ad083fd3c
90 } 90 }
91 91
92 static __inline__ SDL_bool 92 static __inline__ SDL_bool
93 SDL_ShouldPollJoystick() 93 SDL_ShouldPollJoystick()
94 { 94 {
95 #if !SDL_JOYSTICK_DISABLED
95 if (SDL_numjoysticks && 96 if (SDL_numjoysticks &&
96 (!SDL_disabled_events[SDL_JOYAXISMOTION >> 8] || 97 (!SDL_disabled_events[SDL_JOYAXISMOTION >> 8] ||
97 SDL_JoystickEventState(SDL_QUERY))) { 98 SDL_JoystickEventState(SDL_QUERY))) {
98 return SDL_TRUE; 99 return SDL_TRUE;
99 } 100 }
101 #endif
100 return SDL_FALSE; 102 return SDL_FALSE;
101 } 103 }
102 104
103 static int SDLCALL 105 static int SDLCALL
104 SDL_GobbleEvents(void *unused) 106 SDL_GobbleEvents(void *unused)