summaryrefslogtreecommitdiff
path: root/platform/windows/joypad.cpp
diff options
context:
space:
mode:
authorAaron Franke <arnfranke@yahoo.com>2018-10-17 02:46:50 -0400
committerAaron Franke <arnfranke@yahoo.com>2018-10-19 09:11:14 -0400
commitdc2e73499a3264c6c77eb4ddadb6961d684c2941 (patch)
tree1c174aa4cc88f5becbe14bd581a44544ae93085a /platform/windows/joypad.cpp
parentbde3e884c7b1506dd74cb39ea479ea98dd04e7a1 (diff)
Fix compile warnings for Windows from Linux
At least the ones I got when I compiled it using Mingw64 POSIX on Xubuntu 18.04. Plus use the Size2 of get_window_size() directly, rather than reconstructing it.
Diffstat (limited to 'platform/windows/joypad.cpp')
-rw-r--r--platform/windows/joypad.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/windows/joypad.cpp b/platform/windows/joypad.cpp
index 99ac0214e0..7201714fb8 100644
--- a/platform/windows/joypad.cpp
+++ b/platform/windows/joypad.cpp
@@ -172,7 +172,7 @@ bool JoypadWindows::setup_dinput_joypad(const DIDEVICEINSTANCE *instance) {
joy->di_joy->SetDataFormat(&c_dfDIJoystick2);
joy->di_joy->SetCooperativeLevel(*hWnd, DISCL_FOREGROUND);
- joy->di_joy->EnumObjects(objectsCallback, this, NULL);
+ joy->di_joy->EnumObjects(objectsCallback, this, 0);
joy->joy_axis.sort();
joy->guid = instance->guidInstance;