---------------------
PatchSet 4659 
Date: 2007/05/27 14:22:09
Author: amosjeffries
Branch: squid3-ipv6
Tag: (none) 
Log:
Fix compile errors accumulated in IPv4-only build.

Members: 
	lib/IPAddress.cc:1.1.2.41->1.1.2.42 
	src/comm.cc:1.47.2.29->1.47.2.30 

Index: squid3/lib/IPAddress.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/lib/Attic/IPAddress.cc,v
retrieving revision 1.1.2.41
retrieving revision 1.1.2.42
diff -u -r1.1.2.41 -r1.1.2.42
--- squid3/lib/IPAddress.cc	27 May 2007 12:59:20 -0000	1.1.2.41
+++ squid3/lib/IPAddress.cc	27 May 2007 14:22:09 -0000	1.1.2.42
@@ -1,6 +1,6 @@
 
 /*
- * $Id: IPAddress.cc,v 1.1.2.41 2007/05/27 12:59:20 amosjeffries Exp $
+ * $Id: IPAddress.cc,v 1.1.2.42 2007/05/27 14:22:09 amosjeffries Exp $
  *
  * DEBUG: section 14   IP Storage and Handling
  * AUTHOR: Amos Jeffries
@@ -731,6 +731,7 @@
 
         dst.ai_family = ((struct sockaddr_in*)dst.ai_addr)->sin_family;
     }
+#if USE_IPV6
     else if( IsIPv6() ) {
         dst.ai_addr = (struct sockaddr*)new sockaddr_in6;
         GetSockAddr(*((struct sockaddr_in6*)dst.ai_addr));
@@ -739,6 +740,7 @@
         dst.ai_family = ((struct sockaddr_in6*)dst.ai_addr)->sin6_family;
         dst.ai_protocol = IPPROTO_IPV6;
     }
+#endif
     else {
         assert(false);
     }
Index: squid3/src/comm.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/comm.cc,v
retrieving revision 1.47.2.29
retrieving revision 1.47.2.30
diff -u -r1.47.2.29 -r1.47.2.30
--- squid3/src/comm.cc	27 May 2007 14:17:30 -0000	1.47.2.29
+++ squid3/src/comm.cc	27 May 2007 14:22:09 -0000	1.47.2.30
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm.cc,v 1.47.2.29 2007/05/27 14:17:30 amosjeffries Exp $
+ * $Id: comm.cc,v 1.47.2.30 2007/05/27 14:22:09 amosjeffries Exp $
  *
  * DEBUG: section 5     Socket Functions
  * AUTHOR: Harvest Derived
@@ -731,8 +731,10 @@
 
     if(sz == sizeof(sockaddr_in))
         from = *((struct sockaddr_in *)&from_addr);
+#if USE_IPV6
     else if(sz == sizeof(sockaddr_in6))
         from = *((struct sockaddr_in6 *)&from_addr);
+#endif
     else
         debugs( 5, 0, "ERROR: comm_udp_recvfrom does not understand the sockaddr* type of : " << from );