From 70e1abac08e4efdeefa48c9e55c55b3d70e46492 Mon Sep 17 00:00:00 2001 From: The Dax Date: Mon, 2 Jun 2014 08:26:55 -0400 Subject: [PATCH] Win32: Use CALLBACK (__stdcall) for DinputDevice::DevicesCallback. Fixes 32-bit compilation. --- Windows/DinputDevice.cpp | 2 +- Windows/DinputDevice.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Windows/DinputDevice.cpp b/Windows/DinputDevice.cpp index f25559bc6..cd5332bcd 100644 --- a/Windows/DinputDevice.cpp +++ b/Windows/DinputDevice.cpp @@ -97,7 +97,7 @@ LPDIRECTINPUT8 DinputDevice::getPDI() return pDI; } -BOOL DinputDevice::DevicesCallback( +BOOL CALLBACK DinputDevice::DevicesCallback( LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef ) diff --git a/Windows/DinputDevice.h b/Windows/DinputDevice.h index e27bd6684..4b59b1c7b 100644 --- a/Windows/DinputDevice.h +++ b/Windows/DinputDevice.h @@ -43,7 +43,7 @@ private: //also, it excludes the devices that are compatible with XInput static void getDevices(); //callback for the WinAPI to call - static BOOL DevicesCallback( + static BOOL CALLBACK DevicesCallback( LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef );