diff options
| author | Darryl L. Pierce <mcpierce@apache.org> | 2014-10-02 13:55:36 +0000 |
|---|---|---|
| committer | Darryl L. Pierce <mcpierce@apache.org> | 2014-10-02 13:55:36 +0000 |
| commit | f66f177e39f5e7d42cae23952f53e83ecd9d209a (patch) | |
| tree | 54c9e0e0a1668de62b8a2f174c4fae0d92ae0654 /qpid/cpp/src | |
| parent | eec5731347be2c4015854de2522fe6ec654f92e9 (diff) | |
| download | qpid-python-f66f177e39f5e7d42cae23952f53e83ecd9d209a.tar.gz | |
QPID-6128: Fix compiling SocketAddress on ARM
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1628976 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp b/qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp index b96348f6ef..4c860a7ef7 100644 --- a/qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp +++ b/qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp @@ -287,12 +287,20 @@ bool SocketAddress::compareAddresses(const struct addrinfo& lo, return false; } if (lo.ai_family == AF_INET) { - struct sockaddr_in* sin4lo = (struct sockaddr_in*)lo.ai_addr; - struct sockaddr_in* sin4hi = (struct sockaddr_in*)hi.ai_addr; + void* taddr; + + taddr = (void*)lo.ai_addr; + struct sockaddr_in* sin4lo = (struct sockaddr_in*)taddr; + taddr = (void*)hi.ai_addr; + struct sockaddr_in* sin4hi = (struct sockaddr_in*)taddr; result = memcmp(&sin4hi->sin_addr, &sin4lo->sin_addr, sizeof(in_addr)); } else if (lo.ai_family == AF_INET6) { - struct sockaddr_in6* sin6lo = (struct sockaddr_in6*)lo.ai_addr; - struct sockaddr_in6* sin6hi = (struct sockaddr_in6*)hi.ai_addr; + void* taddr; + + taddr = (void*)lo.ai_addr; + struct sockaddr_in6* sin6lo = (struct sockaddr_in6*)taddr; + taddr = (void*)hi.ai_addr; + struct sockaddr_in6* sin6hi = (struct sockaddr_in6*)taddr; result = memcmp(&sin6hi->sin6_addr, &sin6lo->sin6_addr, sizeof(in6_addr)); } else { assert (false); |