ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wbemprox: Use the WS_ prefix to avoid conflicts with Unix headers. 

Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hans Leidekker 2016-10-24 10:04:20 +02:00 committed by Alexandre Julliard
parent 199b0bf84e
commit c8598a7309
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/wbemprox/Makefile.in
View File

@ -1,3 +1,4 @@
EXTRADEFS = -DUSE_WS_PREFIX
MODULE = wbemprox.dll MODULE = wbemprox.dll
IMPORTS = winspool version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 rpcrt4 IMPORTS = winspool version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 rpcrt4

12
dlls/wbemprox/builtin.c
View File

@ -2058,11 +2058,11 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e
int physical; int physical;
enum fill_status status = FILL_STATUS_UNFILTERED; 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 (ret != ERROR_BUFFER_OVERFLOW) return FILL_STATUS_FAILED;
if (!(buffer = heap_alloc( size ))) 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 ); heap_free( buffer );
return FILL_STATUS_FAILED; 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 ) static WCHAR *get_dnshostname( IP_ADAPTER_UNICAST_ADDRESS *addr )
{ {
const SOCKET_ADDRESS *sa = &addr->Address; const SOCKET_ADDRESS *sa = &addr->Address;
WCHAR buf[NI_MAXHOST]; WCHAR buf[WS_NI_MAXHOST];
if (!addr) return NULL; if (!addr) return NULL;
if (GetNameInfoW( sa->lpSockaddr, sa->iSockaddrLength, buf, sizeof(buf)/sizeof(buf[0]), 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 ); return heap_strdupW( buf );
} }
static struct array *get_defaultipgateway( IP_ADAPTER_GATEWAY_ADDRESS *list ) 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; DWORD size = 0, ret;
enum fill_status status = FILL_STATUS_UNFILTERED; 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 (ret != ERROR_BUFFER_OVERFLOW) return FILL_STATUS_FAILED;
if (!(buffer = heap_alloc( size ))) 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 ); heap_free( buffer );
return FILL_STATUS_FAILED; return FILL_STATUS_FAILED;