From 2fa3c554deaa04722b4fa8d3cfb838d498a7cd0a Mon Sep 17 00:00:00 2001
From: Ykkrosh <philip@wildfiregames.com>
Date: Thu, 30 Dec 2010 20:10:04 +0000
Subject: [PATCH] Windows build fixes

This was SVN commit r8845.
---
 source/lib/sysdep/os/win/wsdl.cpp | 10 ++++++++++
 source/lib/sysdep/os/win/wsdl.h   |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/source/lib/sysdep/os/win/wsdl.cpp b/source/lib/sysdep/os/win/wsdl.cpp
index d4519fb25f..db61618f99 100644
--- a/source/lib/sysdep/os/win/wsdl.cpp
+++ b/source/lib/sysdep/os/win/wsdl.cpp
@@ -697,6 +697,11 @@ int SDL_JoystickEventState(int UNUSED(state))
 	return 0;
 }
 
+const char* SDL_JoystickName(int UNUSED(device_index))
+{
+	return NULL;
+}
+
 SDL_Joystick* SDL_JoystickOpen(int UNUSED(device_index))
 {
 	return NULL;
@@ -1456,6 +1461,11 @@ int SDL_Init(Uint32 UNUSED(flags))
 	return (ModuleInit(&initState, Init) < 0)? -1 : 0;
 }
 
+int SDL_InitSubSystem(Uint32 UNUSED(flags))
+{
+	return 0;
+}
+
 void SDL_Quit()
 {
 	ModuleShutdown(&initState, Shutdown);
diff --git a/source/lib/sysdep/os/win/wsdl.h b/source/lib/sysdep/os/win/wsdl.h
index 848482e153..c46d6fd6fc 100644
--- a/source/lib/sysdep/os/win/wsdl.h
+++ b/source/lib/sysdep/os/win/wsdl.h
@@ -45,6 +45,7 @@ typedef u32 Uint32;
 #define SDL_INIT_NOPARACHUTE 0
 
 LIB_API int SDL_Init(Uint32 flags);
+LIB_API int SDL_InitSubSystem(Uint32 flags);
 
 LIB_API void SDL_Quit();
 
@@ -148,6 +149,7 @@ LIB_API Uint8* SDL_GetKeyState(int* num_keys);
 typedef void* SDL_Joystick;
 int SDL_NumJoysticks();
 int SDL_JoystickEventState(int state);
+const char* SDL_JoystickName(int device_index);
 SDL_Joystick* SDL_JoystickOpen(int device_index);
 int SDL_JoystickNumAxes(SDL_Joystick* joystick);
 Sint16 SDL_JoystickGetAxis(SDL_Joystick* joystick, int axis);