From dc2e73499a3264c6c77eb4ddadb6961d684c2941 Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Wed, 17 Oct 2018 02:46:50 -0400 Subject: 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. --- platform/windows/joypad.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'platform/windows/joypad.cpp') 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; -- cgit v1.2.3