diff --git a/nq/source/sys_sdl.c b/nq/source/sys_sdl.c index 3dbfafbba..dd72d5d11 100644 --- a/nq/source/sys_sdl.c +++ b/nq/source/sys_sdl.c @@ -53,17 +53,16 @@ static const char rcsid[] = #include #ifndef _WIN32 +# include +# include # include # include # include -# include -# include #endif #include #include -#include "QF/qargs.h" #include "QF/qargs.h" #include "QF/sys.h" @@ -179,7 +178,7 @@ SDL_main (int c, char **v) host_parms.argc = com_argc; host_parms.argv = com_argv; - host_parms.memsize = 16 * 1024 * 1024; + host_parms.memsize = 16 * 1024 * 1024; // 16MB default heap j = COM_CheckParm ("-mem"); if (j) @@ -190,6 +189,7 @@ SDL_main (int c, char **v) printf ("Can't allocate memory for zone.\n"); return 1; } + #ifndef WIN32 noconinput = COM_CheckParm ("-noconinput"); if (!noconinput) diff --git a/qw/source/cl_sys_sdl.c b/qw/source/cl_sys_sdl.c index 5daae5f0a..5e4fd42dc 100644 --- a/qw/source/cl_sys_sdl.c +++ b/qw/source/cl_sys_sdl.c @@ -46,24 +46,25 @@ static const char rcsid[] = # include #endif -#ifndef _WIN32 -# include -# include -# include -# include -# include -#endif - #include #include #include #include #include + +#ifndef _WIN32 +# include +# include +# include +# include +# include +#endif + #include #include -#include "QF/sys.h" #include "QF/qargs.h" +#include "QF/sys.h" #include "client.h" #include "compat.h" @@ -81,7 +82,6 @@ qboolean Minimized = false; void MaskExceptions (void); #endif - void Sys_Init (void) { @@ -120,8 +120,6 @@ shutdown (void) #endif } - - void Sys_DebugLog (const char *file, const char *fmt, ...) { @@ -181,7 +179,7 @@ SDL_main (int c, char **v) host_parms.argc = com_argc; host_parms.argv = com_argv; - host_parms.memsize = 16 * 1024 * 1024; // 16MB default heap + host_parms.memsize = 16 * 1024 * 1024; // 16MB default heap j = COM_CheckParm ("-mem"); if (j)