From ed70675df35eee1c185f07f8a774fa9c44117d5b Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Sun, 12 Jul 2020 22:37:36 +0100
Subject: [PATCH] added some helpful comments, remove duplicate code

---
 src/i_tcp.c | 1 +
 src/mserv.c | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/i_tcp.c b/src/i_tcp.c
index efd381765..ab8a69a9f 100644
--- a/src/i_tcp.c
+++ b/src/i_tcp.c
@@ -183,6 +183,7 @@
 #endif
 
 #ifndef NONET
+	// define socklen_t in DOS/Windows if it is not already defined
 	#if (defined (WATTCP) && !defined (__libsocket_socklen_t)) || defined (USE_WINSOCK1)
 		typedef int socklen_t;
 	#endif
diff --git a/src/mserv.c b/src/mserv.c
index da163d7f6..72243e950 100644
--- a/src/mserv.c
+++ b/src/mserv.c
@@ -26,9 +26,11 @@
 	#define HAVE_IPV6
 #endif
 
+// -- Monster Iestyn 12/07/20
+// define Winsock related macros like in i_tcp.c (this is really all for socklen_t tbh)
 #ifdef _WIN32
 	#define USE_WINSOCK
-	#if /*defined (_WIN64) ||*/ defined (HAVE_IPV6)
+	#if /*defined (_WIN64) ||*/ defined (HAVE_IPV6) // (to be consistent with below code)
 		#define USE_WINSOCK2
 	#else //_WIN64/HAVE_IPV6
 		#define USE_WINSOCK1
@@ -36,9 +38,6 @@
 #endif //WIN32 OS
 
 #ifndef NONET
-	#ifndef NO_IPV6
-		#define HAVE_IPV6
-	#endif
 	#ifdef _WIN32
 		#define RPC_NO_WINDOWS_H
 		#ifdef HAVE_IPV6
@@ -210,6 +209,7 @@ UINT16 current_port = 0;
 #endif
 
 #ifndef NONET
+	// define socklen_t in DOS/Windows if it is not already defined
 	#if (defined (WATTCP) && !defined (__libsocket_socklen_t)) || defined (USE_WINSOCK1)
 		typedef int socklen_t;
 	#endif