From cd27a1ef05b92e6ccd70b914d71be23fd938b684 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Wed, 21 Aug 2013 12:12:04 -0700 Subject: [PATCH] Fixed compiling on old versions of the DirectX SDK --- src/joystick/windows/SDL_dxjoystick_c.h | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/joystick/windows/SDL_dxjoystick_c.h b/src/joystick/windows/SDL_dxjoystick_c.h index 01cfca970..1b2717216 100644 --- a/src/joystick/windows/SDL_dxjoystick_c.h +++ b/src/joystick/windows/SDL_dxjoystick_c.h @@ -44,6 +44,17 @@ #include #include +#ifndef XUSER_MAX_COUNT +#define XUSER_MAX_COUNT 4 +#endif +#ifndef XUSER_INDEX_ANY +#define XUSER_INDEX_ANY 0x000000FF +#endif +#ifndef XINPUT_CAPS_FFB_SUPPORTED +#define XINPUT_CAPS_FFB_SUPPORTED 0x0001 +#endif + + /* typedef's for XInput structs we use */ typedef struct { @@ -94,13 +105,8 @@ extern DWORD SDL_XInputVersion; /* ((major << 16) & 0xFF00) | (minor & 0xFF) */ #define XINPUTGETSTATE SDL_XInputGetState #define XINPUTSETSTATE SDL_XInputSetState #define XINPUTGETCAPABILITIES SDL_XInputGetCapabilities -#define INVALID_XINPUT_USERID 255 -#define SDL_XINPUT_MAX_DEVICES 4 - -#ifndef XINPUT_CAPS_FFB_SUPPORTED -#define XINPUT_CAPS_FFB_SUPPORTED 0x0001 -#endif - +#define INVALID_XINPUT_USERID XUSER_INDEX_ANY +#define SDL_XINPUT_MAX_DEVICES XUSER_MAX_COUNT #define MAX_INPUTS 256 /* each joystick can have up to 256 inputs */