Filip Navara : iphlpapi: Use prefixed WS_ structures to avoid misalignment on OS X builds.
Alexandre Julliard
julliard at winehq.org
Mon Mar 11 16:24:51 CDT 2013
Module: wine
Branch: master
Commit: 7ca40003d2101c73e97acb5c1f1643c8ef1674c6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ca40003d2101c73e97acb5c1f1643c8ef1674c6
Author: Filip Navara <xnavara at volny.cz>
Date: Sat Mar 9 12:04:17 2013 +0100
iphlpapi: Use prefixed WS_ structures to avoid misalignment on OS X builds.
Thanks to Hans Leidekker for diagnosing the problem.
---
dlls/iphlpapi/iphlpapi_main.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c
index 600bf8c..aeb91c1 100644
--- a/dlls/iphlpapi/iphlpapi_main.c
+++ b/dlls/iphlpapi/iphlpapi_main.c
@@ -848,7 +848,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index
if (num_v4addrs)
{
IP_ADAPTER_UNICAST_ADDRESS *ua;
- struct sockaddr_in *sa;
+ struct WS_sockaddr_in *sa;
aa->Flags |= IP_ADAPTER_IPV4_ENABLED;
ua = aa->FirstUnicastAddress = (IP_ADAPTER_UNICAST_ADDRESS *)ptr;
for (i = 0; i < num_v4addrs; i++)
@@ -860,12 +860,12 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index
ua->Address.iSockaddrLength = sizeof(struct sockaddr_in);
ua->Address.lpSockaddr = (SOCKADDR *)((char *)ua + ua->u.s.Length);
- sa = (struct sockaddr_in *)ua->Address.lpSockaddr;
- sa->sin_family = AF_INET;
- sa->sin_addr.s_addr = v4addrs[i];
- sa->sin_port = 0;
+ sa = (struct WS_sockaddr_in *)ua->Address.lpSockaddr;
+ sa->sin_family = WS_AF_INET;
+ sa->sin_addr.S_un.S_addr = v4addrs[i];
+ sa->sin_port = 0;
TRACE("IPv4 %d/%d: %s\n", i + 1, num_v4addrs,
- debugstr_ipv4(&sa->sin_addr.s_addr, addr_buf));
+ debugstr_ipv4(&sa->sin_addr.S_un.S_addr, addr_buf));
ptr += ua->u.s.Length + ua->Address.iSockaddrLength;
if (i < num_v4addrs - 1)
More information about the wine-cvs
mailing list