summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/Src/SDL.cpp
diff options
context:
space:
mode:
authorhrydgard <hrydgard@gmail.com>2009-02-17 22:48:16 +0000
committerhrydgard <hrydgard@gmail.com>2009-02-17 22:48:16 +0000
commite010ef25da2af624bfd0b0d631cb611c66df3725 (patch)
treedb372ec84843404beab347edc146a138cf0318ab /Source/Core/InputCommon/Src/SDL.cpp
parentf33997e6867357d0e31cd9ca4e273cf38971f90b (diff)
Clean up access to PowerPC::state. Some warning fixes. Restore hold-tab-to-release-throttle on Windows. Fix some project settings.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2297 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon/Src/SDL.cpp')
-rw-r--r--Source/Core/InputCommon/Src/SDL.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/Src/SDL.cpp b/Source/Core/InputCommon/Src/SDL.cpp
index 15b552a08d..b3f81fa2f7 100644
--- a/Source/Core/InputCommon/Src/SDL.cpp
+++ b/Source/Core/InputCommon/Src/SDL.cpp
@@ -123,7 +123,7 @@ bool SearchDevices(std::vector<CONTROLLER_INFO> &_joyinfo, int &_NumPads, int &_
if (SDL_JoystickOpened(i)) SDL_JoystickClose(_joyinfo[i].joy);
}
- _NumPads = _joyinfo.size();
+ _NumPads = (int)_joyinfo.size();
return true;
}