From c6801a158533c5fe84bd7b5df0b517f1f3f4a6f1 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Wed, 16 Nov 2016 02:49:35 +0100
Subject: [PATCH] include-Duplicate_Typedef: Ensure winsock2.h is always
 included first.

---
 ...dpnet-Avoid-redefinition-of-SOCKADDR.patch | 91 ++++++++++++++++++-
 patches/patchinstall.sh                       |  5 +-
 2 files changed, 90 insertions(+), 6 deletions(-)

diff --git a/patches/include-Duplicate_Typedef/0001-dpnet-Avoid-redefinition-of-SOCKADDR.patch b/patches/include-Duplicate_Typedef/0001-dpnet-Avoid-redefinition-of-SOCKADDR.patch
index b3c7f021..3b63902f 100644
--- a/patches/include-Duplicate_Typedef/0001-dpnet-Avoid-redefinition-of-SOCKADDR.patch
+++ b/patches/include-Duplicate_Typedef/0001-dpnet-Avoid-redefinition-of-SOCKADDR.patch
@@ -1,13 +1,96 @@
-From 63d289e33bb3bf81aef7d57750048c58cbbedd60 Mon Sep 17 00:00:00 2001
+From 45971b05a455960603d6565181e90d2025f37492 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.
+Subject: dpnet: Header files cleanup
+
+Also stops error of SOCKADDR being redefined on older compiliers
+
+Fixes: https://bugs.winehq.org/show_bug.cgi?id=41705
 
 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 ---
- include/dpaddr.h | 2 ++
- 1 file changed, 2 insertions(+)
+ dlls/dpnet/address.c    | 1 -
+ dlls/dpnet/client.c     | 1 -
+ dlls/dpnet/lobbiedapp.c | 2 --
+ dlls/dpnet/peer.c       | 1 -
+ dlls/dpnet/server.c     | 1 -
+ dlls/dpnet/threadpool.c | 1 -
+ include/dpaddr.h        | 2 ++
+ 7 files changed, 2 insertions(+), 7 deletions(-)
 
+diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c
+index c5457eb..4d55caa 100644
+--- a/dlls/dpnet/address.c
++++ b/dlls/dpnet/address.c
+@@ -33,7 +33,6 @@
+ #include "wine/unicode.h"
+ #include "wine/debug.h"
+ 
+-#include "dplay8.h"
+ #include "dpnet_private.h"
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(dpnet);
+diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c
+index 9692e38..1fa825f 100644
+--- a/dlls/dpnet/client.c
++++ b/dlls/dpnet/client.c
+@@ -31,7 +31,6 @@
+ #include "objbase.h"
+ #include "wine/debug.h"
+ 
+-#include "dplay8.h"
+ #include "dpnet_private.h"
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(dpnet);
+diff --git a/dlls/dpnet/lobbiedapp.c b/dlls/dpnet/lobbiedapp.c
+index 8ec9ad1..d041e63 100644
+--- a/dlls/dpnet/lobbiedapp.c
++++ b/dlls/dpnet/lobbiedapp.c
+@@ -31,8 +31,6 @@
+ #include "objbase.h"
+ #include "wine/debug.h"
+ 
+-#include "dplay8.h"
+-#include "dplobby8.h"
+ #include "dpnet_private.h"
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(dpnet);
+diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c
+index fe62d59..d7144df 100644
+--- a/dlls/dpnet/peer.c
++++ b/dlls/dpnet/peer.c
+@@ -33,7 +33,6 @@
+ #include "objbase.h"
+ #include "wine/debug.h"
+ 
+-#include "dplay8.h"
+ #include "dpnet_private.h"
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(dpnet);
+diff --git a/dlls/dpnet/server.c b/dlls/dpnet/server.c
+index d91822e..46d5fe2 100644
+--- a/dlls/dpnet/server.c
++++ b/dlls/dpnet/server.c
+@@ -32,7 +32,6 @@
+ #include "ocidl.h"
+ #include "wine/debug.h"
+ 
+-#include "dplay8.h"
+ #include "dpnet_private.h"
+ 
+ typedef struct IDirectPlay8ServerImpl
+diff --git a/dlls/dpnet/threadpool.c b/dlls/dpnet/threadpool.c
+index 274789d..9e13ffb 100644
+--- a/dlls/dpnet/threadpool.c
++++ b/dlls/dpnet/threadpool.c
+@@ -32,7 +32,6 @@
+ #include "objbase.h"
+ #include "wine/debug.h"
+ 
+-#include "dplay8.h"
+ #include "dpnet_private.h"
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(dpnet);
 diff --git a/include/dpaddr.h b/include/dpaddr.h
 index 576caaf..d47dd26 100644
 --- a/include/dpaddr.h
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 05878450..d7e6513d 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -4068,12 +4068,13 @@ fi
 # Patchset include-Duplicate_Typedef
 # |
 # | Modified files:
-# |   *	include/dpaddr.h
+# |   *	dlls/dpnet/address.c, dlls/dpnet/client.c, dlls/dpnet/lobbiedapp.c, dlls/dpnet/peer.c, dlls/dpnet/server.c,
+# | 	dlls/dpnet/threadpool.c, 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 },';
+		echo '+    { "Alistair Leslie-Hughes", "dpnet: Header files cleanup.", 1 },';
 	) >> "$patchlist"
 fi