From aee6767e7d7dc21965c12a52573872a27a5a2cb1 Mon Sep 17 00:00:00 2001
From: Spoike <acceptthis@users.sourceforge.net>
Date: Tue, 29 Jan 2019 23:43:50 +0000
Subject: [PATCH] Misc minor compile fixes that noone else will ever notice

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5397 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 CMakeLists.txt             | 2 +-
 engine/client/menu.c       | 2 ++
 engine/client/snd_dma.c    | 2 +-
 engine/common/vm.h         | 1 +
 engine/http/ftpserver.c    | 3 ++-
 engine/server/sv_sys_win.c | 2 +-
 6 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc0a3d436..1778411b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -740,7 +740,7 @@ ELSE()
 	)
 	SET_TARGET_PROPERTIES(iqmtool PROPERTIES COMPILE_DEFINITIONS "${FTE_REVISON}")
 
-	IF(1)
+	IF(NOT WIN32)
 		ADD_EXECUTABLE(ftemaster
 			${FTESV_ARCH_FILES}
 			engine/server/sv_master.c
diff --git a/engine/client/menu.c b/engine/client/menu.c
index 7d8b8aabf..3b1d86226 100644
--- a/engine/client/menu.c
+++ b/engine/client/menu.c
@@ -1096,7 +1096,9 @@ void M_Menu_Quit_f (void)
 	extern cvar_t cfg_save_auto;
 	char *arg = Cmd_Argv(1);
 
+#ifdef CL_MASTER
 	MasterInfo_WriteServers();
+#endif
 
 	if (!strcmp(arg, "force"))
 		mode = 0;
diff --git a/engine/client/snd_dma.c b/engine/client/snd_dma.c
index 8a9b6a8af..9606e71ba 100644
--- a/engine/client/snd_dma.c
+++ b/engine/client/snd_dma.c
@@ -3496,7 +3496,7 @@ static void S_Q2_AddEntitySounds(soundcardinfo_t *sc)
 		count = CLQ2_GatherSounds(positions, entnums, sounds, countof(sounds));
 	else
 #endif
-#ifdef Q3CLIENT
+#ifdef VM_CG
 	if (cls.protocol == CP_QUAKE3)
 		count = CG_GatherLoopingSounds(positions, entnums, sounds, countof(sounds));
 	else
diff --git a/engine/common/vm.h b/engine/common/vm.h
index f8a4cfcc4..43ca712d1 100644
--- a/engine/common/vm.h
+++ b/engine/common/vm.h
@@ -104,6 +104,7 @@ qboolean CG_VideoRestarted(void);
 int CG_Refresh(void);
 qboolean CG_Command(void);
 qboolean CG_KeyPress(int key, int unicode, int down);
+unsigned int CG_GatherLoopingSounds(vec3_t *positions, unsigned int *entnums, sfx_t **sounds, unsigned int max);
 #endif
 
 typedef struct {
diff --git a/engine/http/ftpserver.c b/engine/http/ftpserver.c
index de4e361fc..a832c5bd7 100644
--- a/engine/http/ftpserver.c
+++ b/engine/http/ftpserver.c
@@ -1344,8 +1344,9 @@ iwboolean FTP_ServerThinkForConnection(FTPclient_t *cl)
 }
 
 #if defined(WEBSVONLY) && defined(_WIN32)
-unsigned int WINAPI BlockingClient(FTPclient_t *cl)
+DWORD WINAPI BlockingClient(void *ctx)
 {
+	FTPclient_t *cl = ctx;
 	unsigned long _false = false;
 	if (ioctlsocket (cl->controlsock, FIONBIO, &_false) == -1)
 	{
diff --git a/engine/server/sv_sys_win.c b/engine/server/sv_sys_win.c
index 22d02872a..74b32900a 100644
--- a/engine/server/sv_sys_win.c
+++ b/engine/server/sv_sys_win.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <sys/types.h>
 #include <sys/timeb.h>
 
-#ifdef SERVERONLY
+#ifndef HAVE_CLIENT
 
 #include <winsock.h>
 #include <conio.h>