summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2014-07-25 01:30:29 +0200
committerPierre Bourdon <delroth@gmail.com>2014-07-25 01:30:29 +0200
commit264459457e738a574c83c151f0b39086759d5845 (patch)
tree4d313526b99f79c8203c2c1f662ac53626c819f0 /Source/Core/InputCommon/ControllerInterface
parente3dde592b68aa219a833650d61638e63217fc71a (diff)
parent5767691f4e9260b25f440ef42bb9853aeba89b56 (diff)
Merge pull request #665 from lioncash/cisms
Get rid of a few C-style struct declarations
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp
index 80b1ac4fd7..9d422192d9 100644
--- a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp
@@ -16,11 +16,11 @@ template class ForceFeedbackDevice::Force<DICONSTANTFORCE>;
template class ForceFeedbackDevice::Force<DIRAMPFORCE>;
template class ForceFeedbackDevice::Force<DIPERIODIC>;
-typedef struct
+struct ForceType
{
GUID guid;
const std::string name;
-} ForceType;
+};
static const ForceType force_type_names[] =
{