---------------------
PatchSet 4157 
Date: 2007/04/05 03:22:34
Author: amosjeffries
Branch: squid3-ipv6
Tag: (none) 
Log:
Drop old conversion code no longer used.

Members: 
	include/config.h:1.7.4.11->1.7.4.12 
	include/util.h:1.10.8.7->1.10.8.8 

Index: squid3/include/config.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/include/config.h,v
retrieving revision 1.7.4.11
retrieving revision 1.7.4.12
diff -u -r1.7.4.11 -r1.7.4.12
--- squid3/include/config.h	24 Mar 2007 06:05:04 -0000	1.7.4.11
+++ squid3/include/config.h	5 Apr 2007 03:22:34 -0000	1.7.4.12
@@ -1,5 +1,5 @@
 /*
- * $Id: config.h,v 1.7.4.11 2007/03/24 06:05:04 amosjeffries Exp $
+ * $Id: config.h,v 1.7.4.12 2007/04/05 03:22:34 amosjeffries Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -204,13 +204,6 @@
 
 typedef int ASN;
 
-//#define SA_IS_ANYADDR(s)                  (memcmp(&(s).sin6_addr, &in6addr_any, sizeof(in6addr_any)) == 0)
-//#define INET_NTOA(s)                      inet6_ntoa(s)
-//#define SA_NTOA(s)                        inet6_ntoa((s).sin6_addr)
-//#define SAFE_INET_ADDR(host, addr)        safe_inet6_addr(host,addr)
-//#define GETHOSTBYNAME(name)               gethostbyname2(name, AF_INET6)
-//#define NEEDS_BRACKETS(s)                 SAFE_INET_ADDR(s,NULL)
-
 #define IN_ADDR in_addr
 #define SOCKADDR_IN sockaddr_in
 #define IP_MREQ ip_mreq
Index: squid3/include/util.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/include/util.h,v
retrieving revision 1.10.8.7
retrieving revision 1.10.8.8
diff -u -r1.10.8.7 -r1.10.8.8
--- squid3/include/util.h	7 Jan 2007 03:46:05 -0000	1.10.8.7
+++ squid3/include/util.h	5 Apr 2007 03:22:35 -0000	1.10.8.8
@@ -1,5 +1,5 @@
 /*
- * $Id: util.h,v 1.10.8.7 2007/01/07 03:46:05 amosjeffries Exp $
+ * $Id: util.h,v 1.10.8.8 2007/04/05 03:22:35 amosjeffries Exp $
  *
  * AUTHOR: Harvest Derived
  *
@@ -44,10 +44,6 @@
 #include <sys/time.h>
 #endif
 
-#if INET6
-#include <arpa/inet.h>
-#endif
-
 #if !defined(SQUIDHOSTNAMELEN)
 #define SQUIDHOSTNAMELEN 256
 #endif
@@ -128,13 +124,7 @@
 #endif
 
 typedef struct IN_ADDR SIA;
-/* FIXME INET6 warning(error): 'struct in_addr' declared inside parameter list */
 SQUIDCEXTERN int safe_inet_addr(const char *, struct in_addr *);
-#ifdef INET6
-SQUIDCEXTERN const char * inet6_ntoa(const struct in6_addr in);
-SQUIDCEXTERN int safe_inet_sockaddr(const char *, struct sockaddr_storage *);
-SQUIDCEXTERN int safe_inet6_addr(const char *, struct in6_addr *);
-#endif
 SQUIDCEXTERN time_t parse_iso3307_time(const char *buf);
 SQUIDCEXTERN char *base64_decode(const char *coded);
 SQUIDCEXTERN const char *base64_encode(const char *decoded);