--------------------- PatchSet 5149 Date: 2007/08/04 12:11:27 Author: amosjeffries Branch: squid3-ipv6 Tag: (none) Log: Rollback FreBSD netinet hack. Didn't work. Members: configure.in:1.63.2.30->1.63.2.31 include/IPAddress.h:1.1.2.26->1.1.2.27 Index: squid3/configure.in =================================================================== RCS file: /cvsroot/squid-sf//squid3/configure.in,v retrieving revision 1.63.2.30 retrieving revision 1.63.2.31 diff -u -r1.63.2.30 -r1.63.2.31 --- squid3/configure.in 4 Aug 2007 02:56:35 -0000 1.63.2.30 +++ squid3/configure.in 4 Aug 2007 12:11:27 -0000 1.63.2.31 @@ -1,7 +1,7 @@ dnl Configuration input file for Squid dnl -dnl $Id: configure.in,v 1.63.2.30 2007/08/04 02:56:35 amosjeffries Exp $ +dnl $Id: configure.in,v 1.63.2.31 2007/08/04 12:11:27 amosjeffries Exp $ dnl dnl dnl @@ -11,7 +11,7 @@ AC_CONFIG_AUX_DIR(cfgaux) AC_CONFIG_SRCDIR([src/main.cc]) AM_INIT_AUTOMAKE([tar-ustar]) -AC_REVISION($Revision: 1.63.2.30 $)dnl +AC_REVISION($Revision: 1.63.2.31 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE @@ -1984,7 +1984,6 @@ netinet/in.h \ netinet/tcp.h \ netinet/ip_fil_compat.h \ - netinet6/in6.h \ openssl/err.h \ openssl/md5.h \ openssl/ssl.h \ Index: squid3/include/IPAddress.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/include/Attic/IPAddress.h,v retrieving revision 1.1.2.26 retrieving revision 1.1.2.27 diff -u -r1.1.2.26 -r1.1.2.27 --- squid3/include/IPAddress.h 4 Aug 2007 02:56:36 -0000 1.1.2.26 +++ squid3/include/IPAddress.h 4 Aug 2007 12:11:27 -0000 1.1.2.27 @@ -1,6 +1,6 @@ /* - * $Id: IPAddress.h,v 1.1.2.26 2007/08/04 02:56:36 amosjeffries Exp $ + * $Id: IPAddress.h,v 1.1.2.27 2007/08/04 12:11:27 amosjeffries Exp $ * * DEBUG: section 14 IP Storage and Handling * AUTHOR: Amos Jeffries @@ -42,9 +42,6 @@ #if HAVE_NETINET_IN_H #include #endif -#if USE_IPV6 && HAVE_NETINET6_IN6_H && defined(_SQUID_FREEBSD_) /* FreeBSD defined IPv6 seperately. */ -#include -#endif #if HAVE_NETDB_H && !defined(_SQUID_NETDB_H_) /* protect NEXTSTEP */ #define _SQUID_NETDB_H_ #ifdef _SQUID_NEXT_