Fixes Issue 2164

Conflicts are due to same file name when omitting full path

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4982 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Core/InputCommon/Src/InputCommon.h

@@ -4,6 +4,26 @@
 
 namespace InputCommon
 {
+enum EButtonType
+{
+	CTL_AXIS = 0,
+	CTL_HAT,
+	CTL_BUTTON,	
+	CTL_KEY,
+};
+
+enum ETriggerType
+{
+	CTL_TRIGGER_SDL = 0,
+	CTL_TRIGGER_XINPUT,
+};
+
+enum EXInputTrigger
+{
+	XI_TRIGGER_L = 0,
+	XI_TRIGGER_R,
+};
+
     void Init(); 
     void Shutdown();
 }