Hans Leidekker : wbemprox: Use the WS_ prefix to avoid conflicts with Unix headers.
Alexandre Julliard
julliard at winehq.org
Mon Oct 24 15:57:54 CDT 2016
Module: wine
Branch: master
Commit: c8598a7309ae0c6bebdb5fcaa96c8142b8687340
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8598a7309ae0c6bebdb5fcaa96c8142b8687340
Author: Hans Leidekker <hans at codeweavers.com>
Date: Mon Oct 24 10:04:20 2016 +0200
wbemprox: Use the WS_ prefix to avoid conflicts with Unix headers.
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wbemprox/Makefile.in | 1 +
dlls/wbemprox/builtin.c | 12 ++++++------
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in
index f411898..e6dc995 100644
--- a/dlls/wbemprox/Makefile.in
+++ b/dlls/wbemprox/Makefile.in
@@ -1,3 +1,4 @@
+EXTRADEFS = -DUSE_WS_PREFIX
MODULE = wbemprox.dll
IMPORTS = winspool version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 rpcrt4
diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c
index b344a12..c8c2f4c 100644
--- a/dlls/wbemprox/builtin.c
+++ b/dlls/wbemprox/builtin.c
@@ -2058,11 +2058,11 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e
int physical;
enum fill_status status = FILL_STATUS_UNFILTERED;
- ret = GetAdaptersAddresses( AF_UNSPEC, 0, NULL, NULL, &size );
+ ret = GetAdaptersAddresses( WS_AF_UNSPEC, 0, NULL, NULL, &size );
if (ret != ERROR_BUFFER_OVERFLOW) return FILL_STATUS_FAILED;
if (!(buffer = heap_alloc( size ))) return FILL_STATUS_FAILED;
- if (GetAdaptersAddresses( AF_UNSPEC, 0, NULL, buffer, &size ))
+ if (GetAdaptersAddresses( WS_AF_UNSPEC, 0, NULL, buffer, &size ))
{
heap_free( buffer );
return FILL_STATUS_FAILED;
@@ -2111,11 +2111,11 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e
static WCHAR *get_dnshostname( IP_ADAPTER_UNICAST_ADDRESS *addr )
{
const SOCKET_ADDRESS *sa = &addr->Address;
- WCHAR buf[NI_MAXHOST];
+ WCHAR buf[WS_NI_MAXHOST];
if (!addr) return NULL;
if (GetNameInfoW( sa->lpSockaddr, sa->iSockaddrLength, buf, sizeof(buf)/sizeof(buf[0]), NULL,
- 0, NI_NAMEREQD )) return NULL;
+ 0, WS_NI_NAMEREQD )) return NULL;
return heap_strdupW( buf );
}
static struct array *get_defaultipgateway( IP_ADAPTER_GATEWAY_ADDRESS *list )
@@ -2203,11 +2203,11 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st
DWORD size = 0, ret;
enum fill_status status = FILL_STATUS_UNFILTERED;
- ret = GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, NULL, NULL, &size );
+ ret = GetAdaptersAddresses( WS_AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, NULL, NULL, &size );
if (ret != ERROR_BUFFER_OVERFLOW) return FILL_STATUS_FAILED;
if (!(buffer = heap_alloc( size ))) return FILL_STATUS_FAILED;
- if (GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, NULL, buffer, &size ))
+ if (GetAdaptersAddresses( WS_AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, NULL, buffer, &size ))
{
heap_free( buffer );
return FILL_STATUS_FAILED;
More information about the wine-cvs
mailing list