Alistair Leslie-Hughes : dpnet: Header files cleanup.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 0b1c912060613b44782fe5d11941b646b59e3305
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0b1c912060613b44782fe5d119...

Author: Alistair Leslie-Hughes 
Date:   Tue Nov 15 06:59:13 2016 +0000

dpnet: Header files cleanup.

Stops error of SOCKADDR being redefined on older compilers.

Signed-off-by: Alistair Leslie-Hughes 
Signed-off-by: Alexandre Julliard 
(cherry picked from commit 5cd33bf892f3a7599f37dba64b1046f22b95af6a)
Signed-off-by: Michael Stefaniuc

---

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 d87d4e7..e6b82fd 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 bf2b8d2..765a1bc 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 507a895..c7b49b9 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 a07a59a..f0a6467 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 3e026fc..65128b4 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
+++ 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