From 85a53457dee0beda3bd65e557d2130c8bb0de8af Mon Sep 17 00:00:00 2001
From: John Peterson <jpeterson57@gmail.com>
Date: Tue, 20 Jan 2009 14:32:15 +0000
Subject: [PATCH] nJoy: Forgot the header file

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1956 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp | 4 ++--
 Source/Plugins/Plugin_nJoy_SDL/Src/XInput.h          | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp
index 8342694fb0..0e3f4880ec 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp
+++ b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp
@@ -54,7 +54,7 @@ static const char* DPadType[] =
 static const char* TriggerType[] =
 {
 	"SDL", // -0x8000 to 0x7fff
-	"XInput", // 0 to 0xff
+	"XInput", // 0x00 to 0xff
 };
 ////////////////////////
 
@@ -406,7 +406,7 @@ void ConfigBox::UpdateGUI(int _notebookpage)
 		// Controller type settings
 		m_Controller[_notebookpage]->FindItem(IDC_DEADZONE)->Enable(Enabled);
 		m_Controller[_notebookpage]->FindItem(IDC_CONTROLTYPE)->Enable(Enabled);
-		m_Controller[_notebookpage]->FindItem(IDC_TRIGGERTYPE)->Enable(Enabled && AnalogTrigger && XInput);
+		m_Controller[_notebookpage]->FindItem(IDC_TRIGGERTYPE)->Enable(Enabled && XInput);
 		m_Controller[_notebookpage]->FindItem(IDCB_MAINSTICK_DIAGONAL)->Enable(Enabled);		
 		m_Controller[_notebookpage]->FindItem(IDCB_MAINSTICK_S_TO_C)->Enable(Enabled);		
 	#endif
diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/XInput.h b/Source/Plugins/Plugin_nJoy_SDL/Src/XInput.h
index 32b5088f02..943d6ef9ea 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Src/XInput.h
+++ b/Source/Plugins/Plugin_nJoy_SDL/Src/XInput.h
@@ -19,6 +19,7 @@
 //
 //////////////////////////////////////////////////////////////////////////////////////////
 
+#ifdef _WIN32
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Includes
@@ -27,6 +28,7 @@
 //////////////////////////////
 
 
+
 namespace XInput
 {
 
@@ -38,4 +40,6 @@ int GetXI(int Controller, int Button);
 bool IsConnected(int Controller);
 //////////////////////////////
 
-} // XInput
\ No newline at end of file
+} // XInput
+
+#endif
\ No newline at end of file