Added patch to fix compile error when SOCKADDR is redefined.

patches/include-Duplicate_Typedef/0001-dpnet-Avoid-redefinition-of-SOCKADDR.patch

@@ -0,0 +1,27 @@
+From 63d289e33bb3bf81aef7d57750048c58cbbedd60 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Tue, 15 Nov 2016 06:59:13 +0000
+Subject: dpnet: Avoid redefinition of SOCKADDR.
+
+Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+---
+ include/dpaddr.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/dpaddr.h b/include/dpaddr.h
+index 576caaf..d47dd26 100644
+--- a/include/dpaddr.h
++++ b/include/dpaddr.h
+@@ -27,7 +27,9 @@ extern "C" {
+ #endif /* defined(__cplusplus) */
+ 
+ typedef REFIID	        DPNAREFIID;
++#ifndef _WINSOCK2API_
+ typedef struct sockaddr SOCKADDR;
++#endif
+ 
+ /*****************************************************************************
+  * DirectPlay8Addr defines
+-- 
+2.9.0
+

patches/patchinstall.sh

@@ -161,6 +161,7 @@ patch_enable_all ()
 	enable_imagehlp_Cleanup="$1"
 	enable_imagehlp_ImageLoad="$1"
 	enable_imm32_IMMDisableLegacyIME="$1"
+	enable_include_Duplicate_Typedef="$1"
 	enable_inseng_Implementation="$1"
 	enable_iphlpapi_System_Ping="$1"
 	enable_iphlpapi_TCP_Table="$1"
@@ -666,6 +667,9 @@ patch_enable ()
 		imm32-IMMDisableLegacyIME)
 			enable_imm32_IMMDisableLegacyIME="$2"
 			;;
+		include-Duplicate_Typedef)
+			enable_include_Duplicate_Typedef="$2"
+			;;
 		inseng-Implementation)
 			enable_inseng_Implementation="$2"
 			;;
@@ -4022,6 +4026,18 @@ if test "$enable_imm32_IMMDisableLegacyIME" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset include-Duplicate_Typedef
+# |
+# | Modified files:
+# |   *	include/dpaddr.h
+# |
+if test "$enable_include_Duplicate_Typedef" -eq 1; then
+	patch_apply include-Duplicate_Typedef/0001-dpnet-Avoid-redefinition-of-SOCKADDR.patch
+	(
+		echo '+    { "Alistair Leslie-Hughes", "dpnet: Avoid redefinition of SOCKADDR.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset inseng-Implementation
 # |
 # | This patchset fixes the following Wine bugs: