aboutsummaryrefslogtreecommitdiff
path: root/backends/sdl/sdl.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2006-05-09 14:16:43 +0000
committerEugene Sandulenko2006-05-09 14:16:43 +0000
commitd2546e397934da3e89fdd994e0c620dd0bcfbcd4 (patch)
tree8e7371097f7421496d6ea24ceaff6feeab7185d1 /backends/sdl/sdl.cpp
parent4c6712246368148c91861fd30677a461e57e698b (diff)
downloadscummvm-rg350-d2546e397934da3e89fdd994e0c620dd0bcfbcd4.tar.gz
scummvm-rg350-d2546e397934da3e89fdd994e0c620dd0bcfbcd4.tar.bz2
scummvm-rg350-d2546e397934da3e89fdd994e0c620dd0bcfbcd4.zip
- Updated MSVC8 project files
- Renamed base/options.cpp to base/commandLine.cpp because of conflict with gui/options.cpp which sit in same directory in MSVC builds - Moved AudioCDManager singleton declaration outside of Audio namespace - Fixed numerous MSVC warning of potentially uninitialized variables and int <-> bool conversions. svn-id: r22397
Diffstat (limited to 'backends/sdl/sdl.cpp')
-rw-r--r--backends/sdl/sdl.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/backends/sdl/sdl.cpp b/backends/sdl/sdl.cpp
index 078a5a2d62..cff313cea4 100644
--- a/backends/sdl/sdl.cpp
+++ b/backends/sdl/sdl.cpp
@@ -35,7 +35,7 @@
#if !defined(_WIN32_WCE) && !defined(__MAEMO__)
#if defined (WIN32)
-int WinMain(HINSTANCE /*hInst*/, HINSTANCE /*hPrevInst*/, LPSTR /*lpCmdLine*/, int /*iShowCmd*/) {
+int __stdcall WinMain(HINSTANCE /*hInst*/, HINSTANCE /*hPrevInst*/, LPSTR /*lpCmdLine*/, int /*iShowCmd*/) {
SDL_SetModuleHandle(GetModuleHandle(NULL));
return main(__argc, __argv);
}
@@ -102,7 +102,6 @@ int main(int argc, char *argv[]) {
}
#endif
-
void OSystem_SDL::initBackend() {
assert(!_inited);