From 0f49ce8fc6aa54224e4c0d6fda8c4527ad39cce1 Mon Sep 17 00:00:00 2001
From: Brad Davis <bradd@imdb.com>
Date: Thu, 24 Jul 2014 16:47:31 -0700
Subject: 0.4 Win-Beta

---
 Samples/CommonSrc/Platform/Win32_Gamepad.h | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'Samples/CommonSrc/Platform/Win32_Gamepad.h')

diff --git a/Samples/CommonSrc/Platform/Win32_Gamepad.h b/Samples/CommonSrc/Platform/Win32_Gamepad.h
index e3f81af..6c80350 100644
--- a/Samples/CommonSrc/Platform/Win32_Gamepad.h
+++ b/Samples/CommonSrc/Platform/Win32_Gamepad.h
@@ -26,19 +26,22 @@ limitations under the License.
 
 #include "Gamepad.h"
 
-#include <windows.h>
+#include <WinSock2.h>
+#include <WS2tcpip.h>
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
 #include <xinput.h>
 
-namespace OVR { namespace Platform { namespace Win32 {
+namespace OVR { namespace OvrPlatform { namespace Win32 {
 
-class GamepadManager : public Platform::GamepadManager
+class GamepadManager : public OvrPlatform::GamepadManager
 {
 public:
     GamepadManager();
     ~GamepadManager();
 
-    virtual UInt32  GetGamepadCount();
-    virtual bool    GetGamepadState(UInt32 index, GamepadState* pState);
+    virtual uint32_t  GetGamepadCount();
+    virtual bool    GetGamepadState(uint32_t index, GamepadState* pState);
 
 private:
     // Dynamically ink to XInput to simplify projects.
@@ -46,7 +49,7 @@ private:
     typedef DWORD (WINAPI *PFn_XInputGetState)(DWORD dwUserIndex, XINPUT_STATE* pState);
     PFn_XInputGetState  pXInputGetState;
 
-    UInt32              LastPadPacketNo;
+    uint32_t            LastPadPacketNo;
 };
 
 }}}
-- 
cgit v1.2.3