diff options
author | 2016-03-18 22:41:17 +0100 | |
---|---|---|
committer | 2016-03-18 22:41:17 +0100 | |
commit | e39daaf5bdcf21d64abf239e1133963643dc6df1 (patch) | |
tree | 1f1b5f333e84bf056ce82c27bebdbad933f26c0d /src/osd/modules/input/input_dinput.cpp | |
parent | 421656e108e7091ee9e1b14c84f0a3f6efc2ad2e (diff) | |
parent | b79020559ea3617b2d6bd4c92041d314045e2938 (diff) |
Merge remote-tracking branch 'refs/remotes/mamedev/master'
Diffstat (limited to 'src/osd/modules/input/input_dinput.cpp')
-rw-r--r-- | src/osd/modules/input/input_dinput.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/osd/modules/input/input_dinput.cpp b/src/osd/modules/input/input_dinput.cpp index a56f913854d..ea4be5682cf 100644 --- a/src/osd/modules/input/input_dinput.cpp +++ b/src/osd/modules/input/input_dinput.cpp @@ -14,7 +14,6 @@ // standard windows headers #define WIN32_LEAN_AND_MEAN #include <windows.h> -#include <winioctl.h> #include <tchar.h> // undef WINNT for dinput.h to prevent duplicate definition @@ -28,7 +27,6 @@ // MAME headers #include "emu.h" #include "osdepend.h" -#include "ui/ui.h" #include "strconv.h" // MAMEOS headers @@ -153,13 +151,15 @@ private: public: dinput_module(const char* type, const char* name) - : wininput_module(type, name) + : wininput_module(type, name), + m_dinput(nullptr), + m_dinput_version(0) { } int init_internal() override { - HRESULT result = S_OK; + HRESULT result; #if DIRECTINPUT_VERSION >= 0x800 m_dinput_version = DIRECTINPUT_VERSION; |