dpnet: Header files cleanup.

Stops error of SOCKADDR being redefined on older compilers. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dpnet: Header files cleanup.
5cd33bf8 · Alistair Leslie-Hughes · Alexandre Julliard · a2545727 · 5cd33bf8 · 5cd33bf8
Commit 5cd33bf8 authored Nov 15, 2016 by Alistair Leslie-Hughes Committed by Alexandre Julliard Nov 17, 2016
7 changed files
--- 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);

--- 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);

--- 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);

--- 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);

--- 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

--- 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);

--- 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