From 4c3c8a2e646c0335810435c0f2f2dd3fdadfdfbe Mon Sep 17 00:00:00 2001 From: Spoike Date: Sun, 23 Jun 2013 20:11:58 +0000 Subject: [PATCH] couple of compile fixes for the webgl port git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4401 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/sys_sdl.c | 2 +- engine/common/plugin.c | 2 +- engine/http/httpclient.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/engine/client/sys_sdl.c b/engine/client/sys_sdl.c index 0c5d61684..6346d48f4 100644 --- a/engine/client/sys_sdl.c +++ b/engine/client/sys_sdl.c @@ -218,7 +218,7 @@ int Sys_EnumerateFiles (const char *gpath, const char *match, int (*func)(const } #elif defined(linux) || defined(__unix__) || defined(__MACH__) #include -int Sys_EnumerateFiles (const char *gpath, const char *match, int (*func)(const char *, int, void *, void *), void *parm, void *spath) +int Sys_EnumerateFiles (const char *gpath, const char *match, int (*func)(const char *, int, void *, searchpathfuncs_t *), void *parm, searchpathfuncs_t *spath) { DIR *dir; char apath[MAX_OSPATH]; diff --git a/engine/common/plugin.c b/engine/common/plugin.c index 547f1f130..1cfd7d780 100644 --- a/engine/common/plugin.c +++ b/engine/common/plugin.c @@ -785,7 +785,7 @@ static qintptr_t VARGS Plug_Cmd_AddCommand(void *offset, quintptr_t mask, const if (plugincommandarray[i].plugin == currentplug) { if (!strcmp(name, plugincommandarray[i].command)) - break; + return true; //already registered } } if (i == plugincommandarraylen) diff --git a/engine/http/httpclient.c b/engine/http/httpclient.c index 6e0636deb..0e6508ff0 100644 --- a/engine/http/httpclient.c +++ b/engine/http/httpclient.c @@ -141,7 +141,7 @@ static void DL_OnProgress(void *c, int position, int totalsize) } //this becomes a poll function. the main thread will call this once a frame or so. -qboolean HTTPDL_Decide(struct dl_download *dl) +qboolean DL_Decide(struct dl_download *dl) { const char *url = dl->redir; if (!*url)