You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by mc...@apache.org on 2014/10/02 15:55:36 UTC
svn commit: r1628976 -
/qpid/trunk/qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp
Author: mcpierce
Date: Thu Oct 2 13:55:36 2014
New Revision: 1628976
URL: http://svn.apache.org/r1628976
Log:
QPID-6128: Fix compiling SocketAddress on ARM
Modified:
qpid/trunk/qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp?rev=1628976&r1=1628975&r2=1628976&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp Thu Oct 2 13:55:36 2014
@@ -287,12 +287,20 @@ bool SocketAddress::compareAddresses(con
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);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org