diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2014-09-10 00:35:16 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2014-09-10 00:35:16 -0500 |
| commit | 71cb09f1ca277436ccff022ba056e32c25c527a8 (patch) | |
| tree | c71de251579aebbdee644b1270789ba4a69a0ca1 /Source/Core/InputCommon/ControllerInterface | |
| parent | 90a5171151c9bfa46314f732540442577c0c0ef1 (diff) | |
| parent | fbc64984ca7de7db10b1a8a4f49002f260c93569 (diff) | |
Merge pull request #1027 from rohit-n/change-include
Include CommonTypes.h instead of Common.h.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ControllerInterface.h | 2 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/Device.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h index af4fc35cc5..24bb493520 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h @@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/Thread.h" #include "InputCommon/ControllerInterface/Device.h" #include "InputCommon/ControllerInterface/ExpressionParser.h" diff --git a/Source/Core/InputCommon/ControllerInterface/Device.h b/Source/Core/InputCommon/ControllerInterface/Device.h index fa4f351cb5..c23c0d29bf 100644 --- a/Source/Core/InputCommon/ControllerInterface/Device.h +++ b/Source/Core/InputCommon/ControllerInterface/Device.h @@ -7,7 +7,7 @@ #include <string> #include <vector> -#include "Common/Common.h" +#include "Common/CommonTypes.h" // idk in case I wanted to change it to double or something, idk what's best typedef double ControlState; |