From 1f4a6daafb57b146bb314d4ad3fd788bae91df61 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Sat, 10 Sep 2011 15:37:10 +0900 Subject: [PATCH] Fixes for win32. I'd forgotten why SDL_main had such a lame prototype. It turns out my previous mingw testing wasing testing SDL :( --- nq/source/sys_sdl.c | 4 ++-- qw/source/cl_sys_sdl.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nq/source/sys_sdl.c b/nq/source/sys_sdl.c index ac22c3bf6..053773e56 100644 --- a/nq/source/sys_sdl.c +++ b/nq/source/sys_sdl.c @@ -102,7 +102,7 @@ shutdown_f (void) #endif int -SDL_main (int argc, const char **argv) +SDL_main (int argc, char *argv[]) { double time, oldtime, newtime; @@ -110,7 +110,7 @@ SDL_main (int argc, const char **argv) memset (&host_parms, 0, sizeof (host_parms)); - COM_InitArgv (argc, argv); + COM_InitArgv (argc, (const char **) argv); host_parms.argc = com_argc; host_parms.argv = com_argv; diff --git a/qw/source/cl_sys_sdl.c b/qw/source/cl_sys_sdl.c index 9e23e7700..2414ccca0 100644 --- a/qw/source/cl_sys_sdl.c +++ b/qw/source/cl_sys_sdl.c @@ -110,7 +110,7 @@ shutdown_f (void) #endif int -SDL_main (int argc, const char **argv) +SDL_main (int argc, char *argv[]) { double time, oldtime, newtime; @@ -118,13 +118,13 @@ SDL_main (int argc, const char **argv) memset (&host_parms, 0, sizeof (host_parms)); - COM_InitArgv (argc, argv); + COM_InitArgv (argc, (const char **) argv); host_parms.argc = com_argc; host_parms.argv = com_argv; - +#ifndef _WIN32 if (!COM_CheckParm ("-noconinput")) fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) | O_NONBLOCK); - +#endif Sys_RegisterShutdown (Host_Shutdown); Sys_RegisterShutdown (Net_LogStop); Sys_RegisterShutdown (shutdown_f);