---------------------
PatchSet 1318 
Date: 2005/04/25 13:57:47
Author: rmartinez
Branch: squid3-ipv6
Tag: (none) 
Log:
Fixing some update conflicts with HEAD. Renaming inet_toa with INET_TOA

Members: 
	src/ACLChecklist.h:1.18.8.4->1.18.8.5 

Index: squid3/src/ACLChecklist.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ACLChecklist.h,v
retrieving revision 1.18.8.4
retrieving revision 1.18.8.5
diff -u -r1.18.8.4 -r1.18.8.5
--- squid3/src/ACLChecklist.h	19 Apr 2005 10:57:55 -0000	1.18.8.4
+++ squid3/src/ACLChecklist.h	25 Apr 2005 13:57:47 -0000	1.18.8.5
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ACLChecklist.h,v 1.18.8.4 2005/04/19 10:57:55 rmartinez Exp $
+ * $Id: ACLChecklist.h,v 1.18.8.5 2005/04/25 13:57:47 rmartinez Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -114,28 +114,12 @@
 
     const acl_access *accessList;
 
-<<<<<<< ACLChecklist.h
-#if ENABLE_IPV6
-    struct inaddr_storage       src_addr6;
-
-    struct inaddr_storage       dst_addr6;
-
-    struct sockaddr_storage     my_sockaddr;
-#else
-    struct in_addr src_addr;
-=======
     struct IN_ADDR src_addr;
->>>>>>> 1.21
 
     struct IN_ADDR dst_addr;
 
-<<<<<<< ACLChecklist.h
-    struct in_addr my_addr;    
-=======
     struct IN_ADDR my_addr;
->>>>>>> 1.21
     unsigned short my_port;
-#endif    
     HttpRequest *request;
     /* for acls that look at reply data */
     HttpReply *reply;