1.1 --- a/src/joystick/windows/SDL_dxjoystick_c.h	Wed Aug 21 10:32:04 2013 -0700
     1.2 +++ b/src/joystick/windows/SDL_dxjoystick_c.h	Wed Aug 21 12:12:04 2013 -0700
     1.3 @@ -44,6 +44,17 @@
     1.4  #include <dbt.h>
     1.5  #include <xinput.h>
     1.6  
     1.7 +#ifndef XUSER_MAX_COUNT
     1.8 +#define XUSER_MAX_COUNT 4
     1.9 +#endif
    1.10 +#ifndef XUSER_INDEX_ANY
    1.11 +#define XUSER_INDEX_ANY     0x000000FF
    1.12 +#endif
    1.13 +#ifndef XINPUT_CAPS_FFB_SUPPORTED
    1.14 +#define XINPUT_CAPS_FFB_SUPPORTED 0x0001
    1.15 +#endif
    1.16 +
    1.17 +
    1.18  /* typedef's for XInput structs we use */
    1.19  typedef struct
    1.20  {
    1.21 @@ -94,13 +105,8 @@
    1.22  #define XINPUTGETSTATE          SDL_XInputGetState
    1.23  #define XINPUTSETSTATE          SDL_XInputSetState
    1.24  #define XINPUTGETCAPABILITIES   SDL_XInputGetCapabilities
    1.25 -#define INVALID_XINPUT_USERID 255
    1.26 -#define SDL_XINPUT_MAX_DEVICES 4
    1.27 -
    1.28 -#ifndef XINPUT_CAPS_FFB_SUPPORTED
    1.29 -#define XINPUT_CAPS_FFB_SUPPORTED 0x0001
    1.30 -#endif
    1.31 -
    1.32 +#define INVALID_XINPUT_USERID   XUSER_INDEX_ANY
    1.33 +#define SDL_XINPUT_MAX_DEVICES  XUSER_MAX_COUNT
    1.34  
    1.35  #define MAX_INPUTS  256     /* each joystick can have up to 256 inputs */
    1.36