Merge 52243c2ff4 into d11cb3779b

src/win32_joystick.c

@@ -522,7 +522,7 @@ void _glfwDetectJoystickConnectionWin32(void)
             if (XInputGetCapabilities(index, XINPUT_FLAG_GAMEPAD, &xic) != ERROR_SUCCESS)
                 continue;
 
-            XINPUT_CAPABILITIES_EX xic_ex;
+            GLFW_XINPUT_CAPABILITIES_EX xic_ex;
             if (!XInputGetCapabilitiesEx || XInputGetCapabilitiesEx(1, index, 0, &xic_ex) != ERROR_SUCCESS)
             {
                 // use a generic VID/PID representing an XInput controller

src/win32_platform.h

@@ -216,7 +216,6 @@ typedef enum
 #define ERROR_INVALID_PROFILE_ARB 0x2096
 #define ERROR_INCOMPATIBLE_DEVICE_CONTEXTS_ARB 0x2054
 
-#ifndef XINPUT_CAPABILITIES_EX
 // this struct might not defined in XInput headers
 typedef struct
 {
@@ -226,12 +225,11 @@ typedef struct
     WORD VersionNumber;
     WORD unk1;
     DWORD unk2;
-} XINPUT_CAPABILITIES_EX;
+} GLFW_XINPUT_CAPABILITIES_EX;
-#endif
 
 // xinput.dll function pointer typedefs
 typedef DWORD (WINAPI * PFN_XInputGetCapabilities)(DWORD,DWORD,XINPUT_CAPABILITIES*);
-typedef DWORD (WINAPI * PFN_XInputGetCapabilitiesEx)(DWORD,DWORD,DWORD,XINPUT_CAPABILITIES_EX*);
+typedef DWORD (WINAPI * PFN_XInputGetCapabilitiesEx)(DWORD,DWORD,DWORD,GLFW_XINPUT_CAPABILITIES_EX*);
 typedef DWORD (WINAPI * PFN_XInputGetState)(DWORD,XINPUT_STATE*);
 #define XInputGetCapabilities _glfw.win32.xinput.GetCapabilities
 #define XInputGetCapabilitiesEx _glfw.win32.xinput.GetCapabilitiesEx