summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/client/http.c1
-rw-r--r--src/refresh/images.c1
-rw-r--r--src/server/save.c1
-rw-r--r--src/windows/system.c3
4 files changed, 5 insertions, 1 deletions
diff --git a/src/client/http.c b/src/client/http.c
index a976fcd..a859d7d 100644
--- a/src/client/http.c
+++ b/src/client/http.c
@@ -724,6 +724,7 @@ static dlhandle_t *find_handle(CURL *curl)
}
Com_Error(ERR_FATAL, "CURL handle not found for CURLMSG_DONE");
+ return NULL;
}
// A download finished, find out what it was, whether there were any errors and
diff --git a/src/refresh/images.c b/src/refresh/images.c
index ae2217f..cf4b56d 100644
--- a/src/refresh/images.c
+++ b/src/refresh/images.c
@@ -2023,6 +2023,7 @@ byte *IMG_GetPalette(void)
fail:
Com_Error(ERR_FATAL, "Couldn't load %s: %s", colormap, Q_ErrorString(ret));
+ return NULL;
}
static const cmdreg_t img_cmd[] = {
diff --git a/src/server/save.c b/src/server/save.c
index e0e6b57..8616512 100644
--- a/src/server/save.c
+++ b/src/server/save.c
@@ -341,6 +341,7 @@ static qerror_t read_server_file(const char *dir)
fail:
Com_Error(ERR_DROP, "Couldn't load %s: %s", dir, Q_ErrorString(ret));
+ return Q_ERR_FAILURE;
}
static void read_level_file(const char *dir)
diff --git a/src/windows/system.c b/src/windows/system.c
index ebce9e3..ca3ada7 100644
--- a/src/windows/system.c
+++ b/src/windows/system.c
@@ -718,7 +718,8 @@ void Sys_Init(void)
#ifndef _WIN64
module = GetModuleHandle("kernel32.dll");
if (module) {
- pSetProcessDEPPolicy = GetProcAddress(module, "SetProcessDEPPolicy");
+ pSetProcessDEPPolicy = (PVOID)GetProcAddress(module,
+ "SetProcessDEPPolicy");
if (pSetProcessDEPPolicy) {
var = Cvar_Get("sys_disabledep", "0", CVAR_NOSET);