diff options
| author | Matthew Parlane <parlane@gmail.com> | 2017-01-24 13:47:36 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-24 13:47:36 +1300 |
| commit | f70a1a27fae804bf7e1b8b85f4e1a990631efc7b (patch) | |
| tree | edf4221f16dd311cbf0370eb005f779c3a1eff9c /Source/Core/InputCommon/ControllerInterface | |
| parent | 00c993143f2934ac9b5cb211e2579a0bcc146864 (diff) | |
| parent | 0bc40cacda333910d7ebfc403122c2b914cd8778 (diff) | |
Merge pull request #4726 from ligfx/addingwindowsheaders
Fix building without PCH on Windows
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/XInput/XInput.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.cpp index 246501dd70..c873a304d5 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.cpp @@ -6,10 +6,8 @@ #include <unordered_set> #include <vector> -// clang-format off #include <Windows.h> #include <SetupAPI.h> -// clang-format on namespace ciface { diff --git a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h index 52530e9a00..f2a81e3840 100644 --- a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h +++ b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h @@ -9,8 +9,8 @@ #pragma once -#include <XInput.h> #include <windows.h> +#include <XInput.h> #include "InputCommon/ControllerInterface/ControllerInterface.h" |