From: Amos Jeffries Date: Thu, 8 May 2008 03:37:45 +0000 (+1200) Subject: Wrap more g++ 4.3.0 located warnings X-Git-Tag: SQUID_3_1_0_1~49^2~254 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f8f9eafb9142a1b33721b4b59fafcc0f0d9e288c;p=thirdparty%2Fsquid.git Wrap more g++ 4.3.0 located warnings --- diff --git a/lib/IPAddress.cc b/lib/IPAddress.cc index 36a26d431e..4dea87589b 100644 --- a/lib/IPAddress.cc +++ b/lib/IPAddress.cc @@ -340,18 +340,20 @@ bool IPAddress::SetIPv4() bool IPAddress::IsLocalhost() const { #if USE_IPV6 - return m_SocketAddr.sin6_addr.s6_addr32[0] == 0 + return ( m_SocketAddr.sin6_addr.s6_addr32[0] == 0 && m_SocketAddr.sin6_addr.s6_addr32[1] == 0 && m_SocketAddr.sin6_addr.s6_addr32[2] == 0 && m_SocketAddr.sin6_addr.s6_addr32[3] == htonl(0x1) - + ) #if !IPV6_SPECIAL_LOCALHOST - || m_SocketAddr.sin6_addr.s6_addr32[0] == 0 + || + ( m_SocketAddr.sin6_addr.s6_addr32[0] == 0 && m_SocketAddr.sin6_addr.s6_addr32[1] == 0 && m_SocketAddr.sin6_addr.s6_addr32[2] == htonl(0xffff) && m_SocketAddr.sin6_addr.s6_addr32[3] == htonl(0x7F000001) + ) #endif - ; + ; #else return (htonl(0x7F000001) == m_SocketAddr.sin_addr.s_addr);