Mercurial > sdl-ios-xcode

comparison src/events/SDL_events.c @ 4698:52697090c967

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix a compile error when SDL_JOYSTICK_DISABLED is set
author Paul Hunkin <paul@bieh.net>
date Sun, 23 May 2010 15:12:41 +1200
parents 363604b42e84
children 1f7ad083fd3c
comparison
equal deleted inserted replaced
4697:a5c4ded0c979 4698:52697090c967
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)