src/events/SDL_events.c
changeset 8860 c4133d635375
parent 8791 44dc9af6b7c2
child 8910 c23ffe72934c
     1.1 --- a/src/events/SDL_events.c	Fri Jun 13 14:52:26 2014 -0400
     1.2 +++ b/src/events/SDL_events.c	Sat Jun 14 23:31:23 2014 -0400
     1.3 @@ -83,19 +83,6 @@
     1.4  } SDL_EventQ = { NULL, SDL_TRUE };
     1.5  
     1.6  
     1.7 -static SDL_INLINE SDL_bool
     1.8 -SDL_ShouldPollJoystick()
     1.9 -{
    1.10 -#if !SDL_JOYSTICK_DISABLED
    1.11 -    if ((!SDL_disabled_events[SDL_JOYAXISMOTION >> 8] ||
    1.12 -         SDL_JoystickEventState(SDL_QUERY)) &&
    1.13 -        SDL_PrivateJoystickNeedsPolling()) {
    1.14 -        return SDL_TRUE;
    1.15 -    }
    1.16 -#endif
    1.17 -    return SDL_FALSE;
    1.18 -}
    1.19 -
    1.20  /* Public functions */
    1.21  
    1.22  void
    1.23 @@ -403,7 +390,7 @@
    1.24      }
    1.25  #if !SDL_JOYSTICK_DISABLED
    1.26      /* Check for joystick state change */
    1.27 -    if (SDL_ShouldPollJoystick()) {
    1.28 +    if ((!SDL_disabled_events[SDL_JOYAXISMOTION >> 8] || SDL_JoystickEventState(SDL_QUERY))) {
    1.29          SDL_JoystickUpdate();
    1.30      }
    1.31  #endif