From 81617eaebc7cf1bfbb615b06af52d593ac371055 Mon Sep 17 00:00:00 2001
From: Spoike <acceptthis@users.sourceforge.net>
Date: Sun, 19 Apr 2020 03:44:32 +0000
Subject: [PATCH] minor compile fixes.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5669 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/client/m_download.c |  8 +++++---
 engine/gl/gl_vidcommon.c   | 11 +++++------
 engine/gl/glquake.h        | 13 +++++--------
 engine/server/server.h     |  2 +-
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/engine/client/m_download.c b/engine/client/m_download.c
index 4cf23590c..daf7945dc 100644
--- a/engine/client/m_download.c
+++ b/engine/client/m_download.c
@@ -251,12 +251,17 @@ static void PM_FreePackage(package_t *p)
 		}
 	}
 
+#ifdef WEBCLIENT
 	if (p->download)
 	{	//if its currently downloading, cancel it.
 		DL_Close(p->download);
 		p->download = NULL;
 	}
 
+	for (i = 0; i < countof(p->mirror); i++)
+		Z_Free(p->mirror[i]);
+#endif
+
 	//free its data.
 	while(p->deps)
 	{
@@ -265,9 +270,6 @@ static void PM_FreePackage(package_t *p)
 		Z_Free(d);
 	}
 
-	for (i = 0; i < countof(p->mirror); i++)
-		Z_Free(p->mirror[i]);
-
 	Z_Free(p->name);
 	Z_Free(p->category);
 	Z_Free(p->title);
diff --git a/engine/gl/gl_vidcommon.c b/engine/gl/gl_vidcommon.c
index 43e6bcbb7..39dc8f621 100644
--- a/engine/gl/gl_vidcommon.c
+++ b/engine/gl/gl_vidcommon.c
@@ -221,12 +221,11 @@ void (APIENTRY *qglDeleteBuffersARB)(GLsizei n, GLuint* ids);
 void (APIENTRY *qglBindBufferARB)(GLenum target, GLuint id);
 void (APIENTRY *qglBufferDataARB)(GLenum target, GLsizei size, const void* data, GLenum usage);
 void (APIENTRY *qglBufferSubDataARB)(GLenum target, GLint offset, GLsizei size, void* data);
-void *(APIENTRY *qglMapBufferARB)(GLenum target, GLenum access);
-GLboolean (APIENTRY *qglUnmapBufferARB)(GLenum target);
-
-void *(APIENTRY *qglMapBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
 #endif
 
+void *(APIENTRY *qglMapBufferARB)(GLenum target, GLenum access);
+GLboolean (APIENTRY *qglUnmapBufferARB)(GLenum target);
+void *(APIENTRY *qglMapBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
 void (APIENTRY *qglBufferStorage)(GLenum target, GLsizeiptr size, const GLvoid *data, GLbitfield flags);
 
 void (APIENTRY *qglTexStorage2D)(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);		//gl4.2
@@ -965,12 +964,12 @@ static qboolean GL_CheckExtensions (void *(*getglfunction) (char *name))
 		qglMapBufferARB = NULL;
 		qglUnmapBufferARB = NULL;
 	}
+#endif
 
 	//ARB_map_buffer_range: core in gl3.0/gles3.0, the extension is backported, and thus no ARB postfix on functions.
-	qglMapBufferRange = (void *)getglext("glMapBufferRange");
+	qglMapBufferRange = qglUnmapBufferARB?(void *)getglext("glMapBufferRange"):NULL;
 
 	if (qglBufferSubDataARB && qglMapBufferRange)
-#endif
 	{
 		if ((!gl_config.gles && gl_config.glversion >= 4.4) || GL_CheckExtension("GL_ARB_buffer_storage"))
 			if (gl_immutable_buffers.ival)
diff --git a/engine/gl/glquake.h b/engine/gl/glquake.h
index 0024e8294..c429aab89 100644
--- a/engine/gl/glquake.h
+++ b/engine/gl/glquake.h
@@ -624,8 +624,6 @@ void R_NetGraph (void);
 #define qglBindBufferARB		glBindBuffer
 #define qglBufferDataARB		glBufferData
 #define qglBufferSubDataARB		glBufferSubData
-#define qglMapBufferARB			glMapBuffer
-#define qglUnmapBufferARB		glUnmapBuffer
 
 #else
 extern void (APIENTRY *qglBindTexture) (GLenum target, GLuint texture);
@@ -727,8 +725,7 @@ extern void (APIENTRY *qglDeleteBuffersARB)(GLsizei n, GLuint* ids);
 extern void (APIENTRY *qglBindBufferARB)(GLenum target, GLuint id);
 extern void (APIENTRY *qglBufferDataARB)(GLenum target, GLsizei size, const void* data, GLenum usage);
 extern void (APIENTRY *qglBufferSubDataARB)(GLenum target, GLint offset, GLsizei size, void* data);
-extern void *(APIENTRY *qglMapBufferARB)(GLenum target, GLenum access);
-extern GLboolean (APIENTRY *qglUnmapBufferARB)(GLenum target);
+#endif
 
 #define GLintptr qintptr_t
 #define GLsizeiptr quintptr_t
@@ -744,10 +741,10 @@ extern GLboolean (APIENTRY *qglUnmapBufferARB)(GLenum target);
 #ifndef GL_MAP_COHERENT_BIT
 #define GL_MAP_COHERENT_BIT 0x0080
 #endif
-extern void *(APIENTRY *qglMapBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
-
-#endif
-extern void (APIENTRY *qglBufferStorage)(GLenum target, GLsizeiptr size, const GLvoid *data, GLbitfield flags);
+extern void *(APIENTRY *qglMapBufferARB)(GLenum target, GLenum access);
+extern GLboolean (APIENTRY *qglUnmapBufferARB)(GLenum target);
+extern void *(APIENTRY *qglMapBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);	//gl3.0
+extern void (APIENTRY *qglBufferStorage)(GLenum target, GLsizeiptr size, const GLvoid *data, GLbitfield flags);		//gl4.4
 
 extern void (APIENTRY *qglGenQueriesARB)(GLsizei n, GLuint *ids);
 extern void (APIENTRY *qglDeleteQueriesARB)(GLsizei n, const GLuint *ids);
diff --git a/engine/server/server.h b/engine/server/server.h
index 76bf683e8..1926a7089 100644
--- a/engine/server/server.h
+++ b/engine/server/server.h
@@ -1261,7 +1261,7 @@ void MSV_OpenUserDatabase(void);
 #define MSV_ClusterLogin(info) false
 #define SSV_IsSubServer() false
 #define MSV_OpenUserDatabase()
-#define MSV_PollSlaves() false
+#define MSV_PollSlaves()
 #define MSV_ForwardToAutoServer() false
 #endif