From f6a334e87e4ed21faa586a21bc09a14bed52e9c3 Mon Sep 17 00:00:00 2001 From: Lance Date: Thu, 19 May 2011 13:55:05 +0000 Subject: [PATCH] Slight modification to my last commit, so MSVC can still compile it git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3789 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/snd_directx.c | 2 +- engine/common/net_wins.c | 2 +- engine/common/plugin.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/engine/client/snd_directx.c b/engine/client/snd_directx.c index 2fbd3e283..b9e38b916 100644 --- a/engine/client/snd_directx.c +++ b/engine/client/snd_directx.c @@ -528,7 +528,7 @@ Direct-Sound support */ int DSOUND_InitCard (soundcardinfo_t *sc, int cardnum) { - extern cvar_t snd_inactive; // snd_eax unused + extern cvar_t snd_inactive, snd_eax; DSBUFFERDESC dsbuf; DSBCAPS dsbcaps; DWORD dwSize, dwWrite; diff --git a/engine/common/net_wins.c b/engine/common/net_wins.c index b889a60ae..7dcd7e536 100644 --- a/engine/common/net_wins.c +++ b/engine/common/net_wins.c @@ -2444,7 +2444,7 @@ qboolean FTENET_IRCConnect_GetPacket(ftenet_generic_connection_t *gcon) } else { - code = strtoul(s, (char ** __restrict__)&s, 10); + code = strtoul(s, (char **)&s, 10); switch (code) { case 001: diff --git a/engine/common/plugin.c b/engine/common/plugin.c index 07e676b86..118713f55 100644 --- a/engine/common/plugin.c +++ b/engine/common/plugin.c @@ -265,7 +265,7 @@ int Plug_SystemCallsVM(void *offset, quintptr_t mask, int fn, const int *arg) fn = fn+1; if (fn>=0 && fn < numplugbuiltins && plugbuiltins[fn].func!=NULL) - return plugbuiltins[fn].func(offset, mask, (const long int *)args); + return plugbuiltins[fn].func(offset, mask, (const long*)args); #undef args Sys_Error("QVM Plugin tried calling invalid builtin %i", fn); return 0;