diff options
| author | Michael Maltese <michaeljosephmaltese@gmail.com> | 2017-01-23 00:53:51 -0800 |
|---|---|---|
| committer | Michael Maltese <michaeljosephmaltese@gmail.com> | 2017-01-23 16:23:37 -0800 |
| commit | 0bc40cacda333910d7ebfc403122c2b914cd8778 (patch) | |
| tree | eb5b130bb361060a0028d095a65ad30650d18af5 /Source/Core | |
| parent | 713ec5ffd526aa5c783e4c6a13bcc45c453e2c10 (diff) | |
No longer need to //clang-format off for Windows headers
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/HW/WiimoteReal/IOWin.cpp | 10 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.cpp | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/Source/Core/Core/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/HW/WiimoteReal/IOWin.cpp index 603eec42ed..6cfea743bb 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/HW/WiimoteReal/IOWin.cpp @@ -9,17 +9,17 @@ #include <unordered_map> #include <unordered_set> -// clang-format off #include <windows.h> -// The following Windows headers must be included AFTER windows.h. #include <BluetoothAPIs.h> #include <Cfgmgr32.h> +#include <dbt.h> #include <hidsdi.h> -#include <initguid.h> +#include <setupapi.h> + // initguid.h must be included before Devpkey.h +// clang-format off +#include <initguid.h> #include <Devpkey.h> -#include <dbt.h> -#include <setupapi.h> // clang-format on #include "Common/CommonFuncs.h" 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 { |