From a002e5ff0a4abd6f166f9bfdf40e02b808b5c2a1 Mon Sep 17 00:00:00 2001
From: Pistachioman <d3rg4m3r@gmail.com>
Date: Fri, 21 Aug 2015 16:44:21 +0200
Subject: [PATCH] Avoid potential header clash between DirectX' and lilypad's
 xinput.h

---
 plugins/LilyPad/DeviceEnumerator.cpp           |  2 +-
 plugins/LilyPad/LilyPad.vcxproj                |  4 ++--
 plugins/LilyPad/LilyPad.vcxproj.filters        | 12 ++++++------
 plugins/LilyPad/{XInput.cpp => XInputEnum.cpp} |  1 +
 plugins/LilyPad/{XInput.h => XInputEnum.h}     |  0
 5 files changed, 10 insertions(+), 9 deletions(-)
 rename plugins/LilyPad/{XInput.cpp => XInputEnum.cpp} (99%)
 rename plugins/LilyPad/{XInput.h => XInputEnum.h} (100%)

diff --git a/plugins/LilyPad/DeviceEnumerator.cpp b/plugins/LilyPad/DeviceEnumerator.cpp
index a848095d3f..7e5bcfd74d 100644
--- a/plugins/LilyPad/DeviceEnumerator.cpp
+++ b/plugins/LilyPad/DeviceEnumerator.cpp
@@ -23,7 +23,7 @@
 #include "DirectInput.h"
 #include "KeyboardHook.h"
 #include "RawInput.h"
-#include "XInput.h"
+#include "XInputEnum.h"
 #include "HidDevice.h"
 #include "DualShock3.h"
 
diff --git a/plugins/LilyPad/LilyPad.vcxproj b/plugins/LilyPad/LilyPad.vcxproj
index bd1a66083e..af6be1ed6b 100644
--- a/plugins/LilyPad/LilyPad.vcxproj
+++ b/plugins/LilyPad/LilyPad.vcxproj
@@ -450,7 +450,7 @@
     <ClCompile Include="WindowsKeyboard.cpp" />
     <ClCompile Include="WindowsMessaging.cpp" />
     <ClCompile Include="WindowsMouse.cpp" />
-    <ClCompile Include="XInput.cpp" />
+    <ClCompile Include="XInputEnum.cpp" />
     <ClCompile Include="DeviceEnumerator.cpp" />
     <ClCompile Include="InputManager.cpp" />
     <ClCompile Include="VKey.cpp">
@@ -484,7 +484,7 @@
     <ClInclude Include="WindowsKeyboard.h" />
     <ClInclude Include="WindowsMessaging.h" />
     <ClInclude Include="WindowsMouse.h" />
-    <ClInclude Include="XInput.h" />
+    <ClInclude Include="XInputEnum.h" />
     <ClInclude Include="DeviceEnumerator.h" />
     <ClInclude Include="InputManager.h" />
     <ClInclude Include="VKey.h" />
diff --git a/plugins/LilyPad/LilyPad.vcxproj.filters b/plugins/LilyPad/LilyPad.vcxproj.filters
index 83a889c3ec..6494843e18 100644
--- a/plugins/LilyPad/LilyPad.vcxproj.filters
+++ b/plugins/LilyPad/LilyPad.vcxproj.filters
@@ -60,9 +60,6 @@
     <ClCompile Include="WindowsMouse.cpp">
       <Filter>InputAPIs</Filter>
     </ClCompile>
-    <ClCompile Include="XInput.cpp">
-      <Filter>InputAPIs</Filter>
-    </ClCompile>
     <ClCompile Include="DeviceEnumerator.cpp">
       <Filter>Input</Filter>
     </ClCompile>
@@ -75,6 +72,9 @@
     <ClCompile Include="WndProcEater.cpp">
       <Filter>Input</Filter>
     </ClCompile>
+    <ClCompile Include="XInputEnum.cpp">
+      <Filter>InputAPIs</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Config.h">
@@ -119,9 +119,6 @@
     <ClInclude Include="WindowsMouse.h">
       <Filter>InputAPIs</Filter>
     </ClInclude>
-    <ClInclude Include="XInput.h">
-      <Filter>InputAPIs</Filter>
-    </ClInclude>
     <ClInclude Include="DeviceEnumerator.h">
       <Filter>Input</Filter>
     </ClInclude>
@@ -134,6 +131,9 @@
     <ClInclude Include="WndProcEater.h">
       <Filter>Input</Filter>
     </ClInclude>
+    <ClInclude Include="XInputEnum.h">
+      <Filter>InputAPIs</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="frog.ico">
diff --git a/plugins/LilyPad/XInput.cpp b/plugins/LilyPad/XInputEnum.cpp
similarity index 99%
rename from plugins/LilyPad/XInput.cpp
rename to plugins/LilyPad/XInputEnum.cpp
index 162d38f4a1..1934241baa 100644
--- a/plugins/LilyPad/XInput.cpp
+++ b/plugins/LilyPad/XInputEnum.cpp
@@ -19,6 +19,7 @@
 #include <xinput.h>
 #include "VKey.h"
 #include "InputManager.h"
+#include "XInputEnum.h"
 
 // This way, I don't require that XInput junk be installed.
 typedef void (CALLBACK *_XInputEnable)(BOOL enable);
diff --git a/plugins/LilyPad/XInput.h b/plugins/LilyPad/XInputEnum.h
similarity index 100%
rename from plugins/LilyPad/XInput.h
rename to plugins/LilyPad/XInputEnum.h