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

@@ -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

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;

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

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 {

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)
 	{

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>