From df78298a11d098c7cfd487f5846abf07d7357e74 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Sat, 29 Aug 2020 17:21:54 -0700
Subject: [PATCH 1/2] C90?

(cherry picked from commit 1f38db46298181d117432e12e88b326a92b4b785)
---
 src/mserv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mserv.c b/src/mserv.c
index 4c044fed2..ba0854049 100644
--- a/src/mserv.c
+++ b/src/mserv.c
@@ -58,7 +58,7 @@ static void MasterServer_OnChange(void);
 static CV_PossibleValue_t masterserver_update_rate_cons_t[] = {
 	{2,  "MIN"},
 	{60, "MAX"},
-	{0}
+	{0,NULL}
 };
 
 consvar_t cv_masterserver = {"masterserver", "https://mb.srb2.org/MS/0", CV_SAVE|CV_CALL, NULL, MasterServer_OnChange, 0, NULL, NULL, 0, 0, NULL};

From 754347987d2128f94111f03a202b4b2977bd5112 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Sat, 29 Aug 2020 17:51:59 -0700
Subject: [PATCH 2/2] Fix stupid NONET

(cherry picked from commit 679bfa21edec6b652def93082da5586e6c755678)
---
 src/d_clisrv.c | 1 -
 src/doomdef.h  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index b3b2cc034..b6b8d63bf 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -2106,7 +2106,6 @@ static boolean CL_ServerConnectionSearchTicker(tic_t *asksent)
 		*asksent = I_GetTime();
 	}
 #else
-	(void)viams;
 	(void)asksent;
 	// No netgames, so we skip this state.
 	cl_mode = CL_ASKJOIN;
diff --git a/src/doomdef.h b/src/doomdef.h
index be4557b1c..e9dddf5d3 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -673,7 +673,7 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
 /// Hardware renderer: OpenGL
 #define GL_SHADERS
 
-#ifdef HAVE_CURL
+#if defined (HAVE_CURL) && ! defined (NONET)
 #define MASTERSERVER
 #else
 #undef UPDATE_ALERT