From: Francesco Chemolli Date: Fri, 20 Jan 2012 18:55:04 +0000 (+0100) Subject: Renamed squid.h to squid-old.h and config.h to squid.h X-Git-Tag: BumpSslServerFirst.take05~12^2~73^2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f7f3304a49c07e7874e9fae279a1e0111e88d2f9;p=thirdparty%2Fsquid.git Renamed squid.h to squid-old.h and config.h to squid.h --- diff --git a/compat/GnuRegex.c b/compat/GnuRegex.c index 2717975b06..d9cda4ec2e 100644 --- a/compat/GnuRegex.c +++ b/compat/GnuRegex.c @@ -32,7 +32,7 @@ #define _GNU_SOURCE 1 #endif -#include "config.h" +#include "squid.h" #if USE_GNUREGEX /* only if squid needs it. Usually not */ diff --git a/compat/assert.cc b/compat/assert.cc index c9d32799b4..922cea02d3 100644 --- a/compat/assert.cc +++ b/compat/assert.cc @@ -31,7 +31,7 @@ * */ -#include "config.h" +#include "squid.h" void xassert(const char *expr, const char *file, int line) { diff --git a/compat/compat.cc b/compat/compat.cc index e36ae43794..527205d90d 100644 --- a/compat/compat.cc +++ b/compat/compat.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "compat.h" void (*failure_notify) (const char *) = NULL; diff --git a/compat/compat.dox b/compat/compat.dox index bcad2effb3..a5557a0d70 100644 --- a/compat/compat.dox +++ b/compat/compat.dox @@ -69,10 +69,10 @@ The strict dependency requirements which exist within the compat API make includ individual part separately a risky operation. \par -Squid coding guidelines require each .c and .cc file to include config.h or squid.h first -in their included files. config.h begin with an order-specific sequence of defines and +Squid coding guidelines require each .c and .cc file to include squid-old.h or squid.h first +in their included files. squid.h begin with an order-specific sequence of defines and includes compat/compat.h to incorporate the compat layer appropriately in every soure file. -squid.h begins by including config.h to prepare for its sub-includes and definitions. +squid.h begins by including squid.h to prepare for its sub-includes and definitions. \par Internally the compat/ directory contains the public API file compat/compat.h which structures diff --git a/compat/compat.h b/compat/compat.h index b964509f34..943ee0763a 100644 --- a/compat/compat.h +++ b/compat/compat.h @@ -8,11 +8,11 @@ * * This file is meant to collate all those hacks files together and * provide a simple include for them in the core squid headers - * (presently squid.h and config.h) + * (presently squid.h and squid-old.h) * * It should not be included directly in any of the squid sources. * If your code requires any symbols from here you should be importing - * config.h/squid.h at the top line of your .cc or .h file. + * squid.h/squid-old.h at the top line of your .cc or .h file. */ diff --git a/compat/debug.cc b/compat/debug.cc index c60d88b8b9..e15892c3be 100644 --- a/compat/debug.cc +++ b/compat/debug.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "compat/debug.h" /* default off */ diff --git a/compat/drand48.c b/compat/drand48.c index 704a0a6fe4..f4f9d6419f 100644 --- a/compat/drand48.c +++ b/compat/drand48.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" /* borrowed from libc/misc/drand48.c in Linux libc-5.4.46 this quick * hack by Martin Hamilton to make Squid build on diff --git a/compat/eui64_aton.c b/compat/eui64_aton.c index 020fdac9e6..2f1cf2d139 100644 --- a/compat/eui64_aton.c +++ b/compat/eui64_aton.c @@ -74,7 +74,7 @@ * Columbia University, New York City */ -#include "config.h" +#include "squid.h" #include "compat/eui64_aton.h" /* diff --git a/compat/fdsetsize.h b/compat/fdsetsize.h index e48b9b6310..2a4ca99d2a 100644 --- a/compat/fdsetsize.h +++ b/compat/fdsetsize.h @@ -15,7 +15,7 @@ */ #ifdef _SYS_TYPES_H #error squid_fdsetsize.h for FDSETSIZE must be included before sys/types.h -#error Make sure that squid.h or config.h is the first file included by your .cc +#error Make sure that squid.h or squid-old.h is the first file included by your .cc #endif #endif /* 0 */ /* diff --git a/compat/getaddrinfo.c b/compat/getaddrinfo.c index 3c799db578..d0b33f6392 100644 --- a/compat/getaddrinfo.c +++ b/compat/getaddrinfo.c @@ -16,7 +16,7 @@ * * Original License and code follows. */ -#include "config.h" +#include "squid.h" /* * This file is part of libESMTP, a library for submission of RFC 2822 diff --git a/compat/getnameinfo.c b/compat/getnameinfo.c index 92e423757b..35a8b9def4 100644 --- a/compat/getnameinfo.c +++ b/compat/getnameinfo.c @@ -18,7 +18,7 @@ * * Original License and code follows. */ -#include "config.h" +#include "squid.h" /* KAME: getnameinfo.c,v 1.72 2005/01/13 04:12:03 itojun Exp */ diff --git a/compat/inet_ntop.c b/compat/inet_ntop.c index 75315ef35d..ea44c17587 100644 --- a/compat/inet_ntop.c +++ b/compat/inet_ntop.c @@ -21,7 +21,7 @@ * Original License and code follows. */ -#include "config.h" +#include "squid.h" #if !HAVE_INET_NTOP #include "inet_ntop.h" diff --git a/compat/inet_pton.c b/compat/inet_pton.c index 4753b74346..b71ed65afa 100644 --- a/compat/inet_pton.c +++ b/compat/inet_pton.c @@ -18,7 +18,7 @@ * Original License and code follows. */ -#include "config.h" +#include "squid.h" #if !HAVE_INET_PTON diff --git a/compat/initgroups.c b/compat/initgroups.c index 2eb748e81b..5548dff4ad 100644 --- a/compat/initgroups.c +++ b/compat/initgroups.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "compat/initgroups.h" #if HAVE_GRP_H diff --git a/compat/mswin.cc b/compat/mswin.cc index f5b3c5f29c..4cae8cfbf5 100644 --- a/compat/mswin.cc +++ b/compat/mswin.cc @@ -34,7 +34,7 @@ * */ -#include "config.h" +#include "squid.h" #include "util.h" /* The following code section is part of an EXPERIMENTAL native */ diff --git a/compat/psignal.c b/compat/psignal.c index 5e07ec14e2..6d06b71045 100644 --- a/compat/psignal.c +++ b/compat/psignal.c @@ -2,7 +2,7 @@ * Author: Jens-S. V?ckler * Ripped from Purge tool implementation. */ -#include "config.h" +#include "squid.h" #include "psignal.h" #if _SQUID_AIX_ || _SQUID_MINGW_ diff --git a/compat/shm.cc b/compat/shm.cc index 29a44c3451..8ca7e2402b 100644 --- a/compat/shm.cc +++ b/compat/shm.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "compat/shm.h" #if _SQUID_FREEBSD_ && (__FreeBSD__ >= 7) diff --git a/compat/strerror.c b/compat/strerror.c index 1e59172dfe..de510cb07d 100644 --- a/compat/strerror.c +++ b/compat/strerror.c @@ -32,7 +32,7 @@ * */ -#include "config.h" +#include "squid.h" #if HAVE_ERRNO_H #include diff --git a/compat/strnrchr.c b/compat/strnrchr.c index d5d1753553..b26b4f2097 100644 --- a/compat/strnrchr.c +++ b/compat/strnrchr.c @@ -28,7 +28,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. */ -#include "config.h" +#include "squid.h" #include "strnrchr.h" const char * diff --git a/compat/strnstr.cc b/compat/strnstr.cc index 7c2f058ded..f64cecdda6 100644 --- a/compat/strnstr.cc +++ b/compat/strnstr.cc @@ -17,7 +17,7 @@ * Original License and code follows. */ -#include "config.h" +#include "squid.h" #if !HAVE_STRNSTR diff --git a/compat/strsep.c b/compat/strsep.c index 0e2739f682..5fbd788209 100644 --- a/compat/strsep.c +++ b/compat/strsep.c @@ -17,7 +17,7 @@ * USA. */ -#include "config.h" +#include "squid.h" #include "compat/strsep.h" #include diff --git a/compat/strtoll.c b/compat/strtoll.c index da7fc5fb35..8b3ad48c20 100644 --- a/compat/strtoll.c +++ b/compat/strtoll.c @@ -33,7 +33,7 @@ /* modified for long long 1999-08-12 */ -#include "config.h" +#include "squid.h" #include "compat/strtoll.h" #if HAVE_CTYPE_H diff --git a/compat/tempnam.c b/compat/tempnam.c index 8e61f44671..6e4e825b5f 100644 --- a/compat/tempnam.c +++ b/compat/tempnam.c @@ -8,7 +8,7 @@ * temp file is written in /tmp. */ -#include "config.h" +#include "squid.h" #include "compat/tempnam.h" #if HAVE_LIBC_H diff --git a/compat/testPreCompiler.cc b/compat/testPreCompiler.cc index 11a42e7a9c..d131a12814 100644 --- a/compat/testPreCompiler.cc +++ b/compat/testPreCompiler.cc @@ -1,5 +1,5 @@ #define SQUID_UNIT_TEST 1 -#include "config.h" +#include "squid.h" #if HAVE_ASSERT_H #include diff --git a/compat/xalloc.cc b/compat/xalloc.cc index bd84bef9e2..a4eafa9dad 100644 --- a/compat/xalloc.cc +++ b/compat/xalloc.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "compat/xalloc.h" #include "profiler/Profiler.h" diff --git a/compat/xstrerror.cc b/compat/xstrerror.cc index a63be5f47a..363efcaf55 100644 --- a/compat/xstrerror.cc +++ b/compat/xstrerror.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "compat/xstrerror.h" #if HAVE_STRING_H diff --git a/compat/xstring.cc b/compat/xstring.cc index 34d2ecd8a9..77db689ef0 100644 --- a/compat/xstring.cc +++ b/compat/xstring.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "compat/xalloc.h" #include "compat/xstring.h" diff --git a/compat/xstrto.cc b/compat/xstrto.cc index 1e83e05fb2..81f904fb44 100644 --- a/compat/xstrto.cc +++ b/compat/xstrto.cc @@ -28,7 +28,7 @@ * Original License and code follows. */ -#include "config.h" +#include "squid.h" #include "compat/xstrto.h" /* diff --git a/contrib/rredir.c b/contrib/rredir.c index 9650e0a662..9dfcc855f1 100644 --- a/contrib/rredir.c +++ b/contrib/rredir.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" /* * From: richard@hekkihek.hacom.nl (Richard Huveneers) diff --git a/doc/Programming-Guide/02_CodingConventions.dox b/doc/Programming-Guide/02_CodingConventions.dox index 22bccd5d52..364f6f6b0a 100644 --- a/doc/Programming-Guide/02_CodingConventions.dox +++ b/doc/Programming-Guide/02_CodingConventions.dox @@ -11,7 +11,7 @@ \par If you need to use specific width types - such as a 16 bit unsigned integer, use one of the following types. To access - them simply include "config.h". + them simply include "squid.h". \verbatim int16_t - 16 bit signed. diff --git a/helpers/basic_auth/LDAP/basic_ldap_auth.cc b/helpers/basic_auth/LDAP/basic_ldap_auth.cc index 2ec5ef4d96..04e40ab827 100644 --- a/helpers/basic_auth/LDAP/basic_ldap_auth.cc +++ b/helpers/basic_auth/LDAP/basic_ldap_auth.cc @@ -82,7 +82,7 @@ * - Allow full filter specifications in -f */ -#include "config.h" +#include "squid.h" #define LDAP_DEPRECATED 1 diff --git a/helpers/basic_auth/MSNT/allowusers.cc b/helpers/basic_auth/MSNT/allowusers.cc index e6783080b0..ff417e8839 100644 --- a/helpers/basic_auth/MSNT/allowusers.cc +++ b/helpers/basic_auth/MSNT/allowusers.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" /* * allowusers.c diff --git a/helpers/basic_auth/MSNT/confload.cc b/helpers/basic_auth/MSNT/confload.cc index e04365ed70..cbb72d3e1e 100644 --- a/helpers/basic_auth/MSNT/confload.cc +++ b/helpers/basic_auth/MSNT/confload.cc @@ -11,7 +11,7 @@ */ /* Squid provides a number of portability overrides */ -#include "config.h" +#include "squid.h" #include #include diff --git a/helpers/basic_auth/MSNT/denyusers.cc b/helpers/basic_auth/MSNT/denyusers.cc index 4bf86cbe71..6192fe99e1 100644 --- a/helpers/basic_auth/MSNT/denyusers.cc +++ b/helpers/basic_auth/MSNT/denyusers.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" /* * denyusers.c diff --git a/helpers/basic_auth/MSNT/msntauth.cc b/helpers/basic_auth/MSNT/msntauth.cc index a213f3b890..b6b844d742 100644 --- a/helpers/basic_auth/MSNT/msntauth.cc +++ b/helpers/basic_auth/MSNT/msntauth.cc @@ -29,7 +29,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "config.h" +#include "squid.h" #include "rfc1738.h" #include "util.h" diff --git a/helpers/basic_auth/MSNT/usersfile.cc b/helpers/basic_auth/MSNT/usersfile.cc index 3074c1eddd..ef889e55c2 100644 --- a/helpers/basic_auth/MSNT/usersfile.cc +++ b/helpers/basic_auth/MSNT/usersfile.cc @@ -8,7 +8,7 @@ * The code originated from denyusers.c. */ -#include "config.h" +#include "squid.h" #include "util.h" #include diff --git a/helpers/basic_auth/MSNT/valid.cc b/helpers/basic_auth/MSNT/valid.cc index f82dab63c5..ce385dfab2 100644 --- a/helpers/basic_auth/MSNT/valid.cc +++ b/helpers/basic_auth/MSNT/valid.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #if HAVE_SYS_TYPES_H #include #endif diff --git a/helpers/basic_auth/NCSA/basic_ncsa_auth.cc b/helpers/basic_auth/NCSA/basic_ncsa_auth.cc index d624306a8a..f5ef97e643 100644 --- a/helpers/basic_auth/NCSA/basic_ncsa_auth.cc +++ b/helpers/basic_auth/NCSA/basic_ncsa_auth.cc @@ -16,7 +16,7 @@ * MD5 without salt and magic strings - Added by Ramon de Carvalho and Rodrigo Rubira Branco */ -#include "config.h" +#include "squid.h" #include "crypt_md5.h" #include "hash.h" #include "helpers/defines.h" diff --git a/helpers/basic_auth/NCSA/crypt_md5.cc b/helpers/basic_auth/NCSA/crypt_md5.cc index 410ac4fa04..abffb9ae6d 100644 --- a/helpers/basic_auth/NCSA/crypt_md5.cc +++ b/helpers/basic_auth/NCSA/crypt_md5.cc @@ -14,7 +14,7 @@ * Origin: Id: crypt.c,v 1.3 1995/05/30 05:42:22 rgrimes Exp * */ -#include "config.h" +#include "squid.h" #if HAVE_STRING_H #include diff --git a/helpers/basic_auth/NIS/basic_nis_auth.cc b/helpers/basic_auth/NIS/basic_nis_auth.cc index 75166726c7..9a0068dcfd 100644 --- a/helpers/basic_auth/NIS/basic_nis_auth.cc +++ b/helpers/basic_auth/NIS/basic_nis_auth.cc @@ -3,7 +3,7 @@ * From NCSA Authentication module */ -#include "config.h" +#include "squid.h" #include "hash.h" #include "nis_support.h" #include "rfc1738.h" diff --git a/helpers/basic_auth/NIS/nis_support.cc b/helpers/basic_auth/NIS/nis_support.cc index d6558bafda..075eb5b667 100644 --- a/helpers/basic_auth/NIS/nis_support.cc +++ b/helpers/basic_auth/NIS/nis_support.cc @@ -1,7 +1,7 @@ /* * Written By Rabellino Sergio (rabellino@di.unito.it) For Solaris 2.x */ -#include "config.h" +#include "squid.h" #include #include #include diff --git a/helpers/basic_auth/PAM/basic_pam_auth.cc b/helpers/basic_auth/PAM/basic_pam_auth.cc index 3f8f0eee1c..8be058e817 100644 --- a/helpers/basic_auth/PAM/basic_pam_auth.cc +++ b/helpers/basic_auth/PAM/basic_pam_auth.cc @@ -65,7 +65,7 @@ * * Compile this program with: gcc -o basic_pam_auth basic_pam_auth.cc -lpam -ldl */ -#include "config.h" +#include "squid.h" #include "helpers/defines.h" #include "rfc1738.h" #include "util.h" diff --git a/helpers/basic_auth/RADIUS/basic_radius_auth.cc b/helpers/basic_auth/RADIUS/basic_radius_auth.cc index 23708aebb9..0cf9b78876 100644 --- a/helpers/basic_auth/RADIUS/basic_radius_auth.cc +++ b/helpers/basic_auth/RADIUS/basic_radius_auth.cc @@ -45,7 +45,7 @@ * and many others */ -#include "config.h" +#include "squid.h" #include "helpers/defines.h" #include "md5.h" #include "radius.h" diff --git a/helpers/basic_auth/RADIUS/radius-util.cc b/helpers/basic_auth/RADIUS/radius-util.cc index 5a4ba44bf7..96692e525a 100644 --- a/helpers/basic_auth/RADIUS/radius-util.cc +++ b/helpers/basic_auth/RADIUS/radius-util.cc @@ -36,7 +36,7 @@ char util_sccsid[] = "@(#)util.c 1.5 Copyright 1992 Livingston Enterprises Inc\n" " 2.1 Copyright 1997 Cistron Internet Services B.V."; -#include "config.h" +#include "squid.h" #if HAVE_SYS_SOCKET_H #include diff --git a/helpers/basic_auth/SASL/basic_sasl_auth.cc b/helpers/basic_auth/SASL/basic_sasl_auth.cc index ef0001ea42..bdff532a2f 100644 --- a/helpers/basic_auth/SASL/basic_sasl_auth.cc +++ b/helpers/basic_auth/SASL/basic_sasl_auth.cc @@ -26,7 +26,7 @@ * or with SASL2: gcc -Wall -o sasl_auth sasl_auth.c -lsasl2 * */ -#include "config.h" +#include "squid.h" #include "helpers/defines.h" #include "rfc1738.h" #include "util.h" diff --git a/helpers/basic_auth/SMB/basic_smb_auth.cc b/helpers/basic_auth/SMB/basic_smb_auth.cc index bdaf3ca486..2e715112c0 100644 --- a/helpers/basic_auth/SMB/basic_smb_auth.cc +++ b/helpers/basic_auth/SMB/basic_smb_auth.cc @@ -40,7 +40,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. */ -#include "config.h" +#include "squid.h" #include "helpers/defines.h" #include "rfc1738.h" #include "util.h" diff --git a/helpers/basic_auth/SSPI/basic_sspi_auth.cc b/helpers/basic_auth/SSPI/basic_sspi_auth.cc index 7bfcf053ef..ef43acfe3c 100644 --- a/helpers/basic_auth/SSPI/basic_sspi_auth.cc +++ b/helpers/basic_auth/SSPI/basic_sspi_auth.cc @@ -24,7 +24,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. */ -#include "config.h" +#include "squid.h" #include "helpers/defines.h" #include "util.h" diff --git a/helpers/basic_auth/SSPI/valid.cc b/helpers/basic_auth/SSPI/valid.cc index 147ac0c5b0..1a0f419ce1 100644 --- a/helpers/basic_auth/SSPI/valid.cc +++ b/helpers/basic_auth/SSPI/valid.cc @@ -26,7 +26,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. */ -#include "config.h" +#include "squid.h" #include "util.h" /* Check if we try to compile on a Windows Platform */ diff --git a/helpers/basic_auth/fake/fake.cc b/helpers/basic_auth/fake/fake.cc index 85657b04a2..65a76be56b 100644 --- a/helpers/basic_auth/fake/fake.cc +++ b/helpers/basic_auth/fake/fake.cc @@ -12,7 +12,7 @@ * squid under the same conditions as the main squid application. */ -#include "config.h" +#include "squid.h" #include "helpers/defines.h" #if HAVE_CSTRING diff --git a/helpers/basic_auth/getpwnam/basic_getpwnam_auth.cc b/helpers/basic_auth/getpwnam/basic_getpwnam_auth.cc index 7e57b2e59f..bb501b0f7e 100644 --- a/helpers/basic_auth/getpwnam/basic_getpwnam_auth.cc +++ b/helpers/basic_auth/getpwnam/basic_getpwnam_auth.cc @@ -24,7 +24,7 @@ * */ -#include "config.h" +#include "squid.h" #include "helpers/defines.h" #include "rfc1738.h" //#include "util.h" diff --git a/helpers/digest_auth/LDAP/digest_pw_auth.cc b/helpers/digest_auth/LDAP/digest_pw_auth.cc index a83ac45bd4..0a62f1d818 100644 --- a/helpers/digest_auth/LDAP/digest_pw_auth.cc +++ b/helpers/digest_auth/LDAP/digest_pw_auth.cc @@ -29,7 +29,7 @@ * * Copyright (c) 2003 Robert Collins */ -#include "config.h" +#include "squid.h" #include "digest_common.h" #include "helpers/defines.h" #include "ldap_backend.h" diff --git a/helpers/digest_auth/LDAP/ldap_backend.cc b/helpers/digest_auth/LDAP/ldap_backend.cc index d6a6deb5f7..6efcaed9cb 100644 --- a/helpers/digest_auth/LDAP/ldap_backend.cc +++ b/helpers/digest_auth/LDAP/ldap_backend.cc @@ -5,7 +5,7 @@ * ldap_backend.c * AUTHOR: Flavio Pescuma, MARA Systems AB */ -#include "config.h" +#include "squid.h" #include "util.h" #define LDAP_DEPRECATED 1 diff --git a/helpers/digest_auth/eDirectory/digest_pw_auth.cc b/helpers/digest_auth/eDirectory/digest_pw_auth.cc index e2359a6bc0..6087df6cfd 100644 --- a/helpers/digest_auth/eDirectory/digest_pw_auth.cc +++ b/helpers/digest_auth/eDirectory/digest_pw_auth.cc @@ -29,7 +29,7 @@ * * Copyright (c) 2003 Robert Collins */ -#include "config.h" +#include "squid.h" #include "digest_common.h" #include "helpers/defines.h" #include "ldap_backend.h" diff --git a/helpers/digest_auth/eDirectory/edir_ldapext.cc b/helpers/digest_auth/eDirectory/edir_ldapext.cc index 48921f8400..49d896eeb0 100644 --- a/helpers/digest_auth/eDirectory/edir_ldapext.cc +++ b/helpers/digest_auth/eDirectory/edir_ldapext.cc @@ -22,7 +22,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * */ -#include "config.h" +#include "squid.h" #include "digest_common.h" diff --git a/helpers/digest_auth/eDirectory/ldap_backend.cc b/helpers/digest_auth/eDirectory/ldap_backend.cc index 5281369f03..0a40403c9a 100644 --- a/helpers/digest_auth/eDirectory/ldap_backend.cc +++ b/helpers/digest_auth/eDirectory/ldap_backend.cc @@ -5,7 +5,7 @@ * ldap_backend.c * AUTHOR: Flavio Pescuma, MARA Systems AB */ -#include "config.h" +#include "squid.h" #define LDAP_DEPRECATED 1 diff --git a/helpers/digest_auth/file/digest_file_auth.cc b/helpers/digest_auth/file/digest_file_auth.cc index 7ea933228a..b0ed8be907 100644 --- a/helpers/digest_auth/file/digest_file_auth.cc +++ b/helpers/digest_auth/file/digest_file_auth.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003 Robert Collins */ -#include "config.h" +#include "squid.h" #include "digest_common.h" #include "helpers/defines.h" #include "text_backend.h" diff --git a/helpers/digest_auth/file/text_backend.cc b/helpers/digest_auth/file/text_backend.cc index a5b46ec3fe..eb499e69ae 100644 --- a/helpers/digest_auth/file/text_backend.cc +++ b/helpers/digest_auth/file/text_backend.cc @@ -28,7 +28,7 @@ * * Copyright (c) 2003 Robert Collins */ -#include "config.h" +#include "squid.h" #include "text_backend.h" diff --git a/helpers/external_acl/AD_group/ext_ad_group_acl.cc b/helpers/external_acl/AD_group/ext_ad_group_acl.cc index c45eefae5f..62c8a0b2a5 100644 --- a/helpers/external_acl/AD_group/ext_ad_group_acl.cc +++ b/helpers/external_acl/AD_group/ext_ad_group_acl.cc @@ -57,7 +57,7 @@ * */ -#include "config.h" +#include "squid.h" #include "helpers/defines.h" #include "include/util.h" diff --git a/helpers/external_acl/LDAP_group/ext_ldap_group_acl.cc b/helpers/external_acl/LDAP_group/ext_ldap_group_acl.cc index 135a21bd5e..2a1a778ff0 100644 --- a/helpers/external_acl/LDAP_group/ext_ldap_group_acl.cc +++ b/helpers/external_acl/LDAP_group/ext_ldap_group_acl.cc @@ -34,7 +34,7 @@ * as published by the Free Software Foundation; either version 2, * or (at your option) any later version. */ -#include "config.h" +#include "squid.h" #include "helpers/defines.h" #include "rfc1738.h" #include "util.h" diff --git a/helpers/external_acl/LM_group/ext_lm_group_acl.cc b/helpers/external_acl/LM_group/ext_lm_group_acl.cc index 5cb49c6231..5755dbcc5e 100644 --- a/helpers/external_acl/LM_group/ext_lm_group_acl.cc +++ b/helpers/external_acl/LM_group/ext_lm_group_acl.cc @@ -67,7 +67,7 @@ * */ -#include "config.h" +#include "squid.h" #include "helpers/defines.h" #include "include/util.h" diff --git a/helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc b/helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc index 7195f62336..81cbcaf55f 100644 --- a/helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc +++ b/helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc @@ -26,7 +26,7 @@ */ /* Squid-3.X includes */ -#include "config.h" +#include "squid.h" #include "helpers/defines.h" #include "rfc1738.h" #include "util.h" diff --git a/helpers/external_acl/file_userip/ext_file_userip_acl.cc b/helpers/external_acl/file_userip/ext_file_userip_acl.cc index 656cb5d537..8aa7f22bb7 100644 --- a/helpers/external_acl/file_userip/ext_file_userip_acl.cc +++ b/helpers/external_acl/file_userip/ext_file_userip_acl.cc @@ -18,7 +18,7 @@ * Author: Rodrigo Campos (rodrigo@geekbunker.org) * */ -#include "config.h" +#include "squid.h" #include "helpers/defines.h" #include "rfc1738.h" #include "util.h" diff --git a/helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc b/helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc index 683ef4994c..634d6ecad7 100644 --- a/helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc +++ b/helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc @@ -29,7 +29,7 @@ /* * Hosted at http://sourceforge.net/projects/squidkerbauth */ -#include "config.h" +#include "squid.h" #include "helpers/defines.h" #include "util.h" diff --git a/helpers/external_acl/kerberos_ldap_group/support_group.cc b/helpers/external_acl/kerberos_ldap_group/support_group.cc index 112e83ec85..17779b6814 100644 --- a/helpers/external_acl/kerberos_ldap_group/support_group.cc +++ b/helpers/external_acl/kerberos_ldap_group/support_group.cc @@ -23,7 +23,7 @@ * ----------------------------------------------------------------------------- */ -#include "config.h" +#include "squid.h" #include "util.h" #ifdef HAVE_LDAP diff --git a/helpers/external_acl/kerberos_ldap_group/support_krb5.cc b/helpers/external_acl/kerberos_ldap_group/support_krb5.cc index 0495fc51f6..f5ae7ea0d0 100644 --- a/helpers/external_acl/kerberos_ldap_group/support_krb5.cc +++ b/helpers/external_acl/kerberos_ldap_group/support_krb5.cc @@ -22,7 +22,7 @@ * ----------------------------------------------------------------------------- */ -#include "config.h" +#include "squid.h" #include "util.h" #if defined(HAVE_LDAP) && defined(HAVE_KRB5) diff --git a/helpers/external_acl/kerberos_ldap_group/support_ldap.cc b/helpers/external_acl/kerberos_ldap_group/support_ldap.cc index d15baf69c8..594b8559f0 100644 --- a/helpers/external_acl/kerberos_ldap_group/support_ldap.cc +++ b/helpers/external_acl/kerberos_ldap_group/support_ldap.cc @@ -22,7 +22,7 @@ * ----------------------------------------------------------------------------- */ -#include "config.h" +#include "squid.h" #include "util.h" #ifdef HAVE_LDAP diff --git a/helpers/external_acl/kerberos_ldap_group/support_log.cc b/helpers/external_acl/kerberos_ldap_group/support_log.cc index d2421f8c7d..fceec56315 100644 --- a/helpers/external_acl/kerberos_ldap_group/support_log.cc +++ b/helpers/external_acl/kerberos_ldap_group/support_log.cc @@ -22,7 +22,7 @@ * ----------------------------------------------------------------------------- */ -#include "config.h" +#include "squid.h" #ifdef HAVE_LDAP diff --git a/helpers/external_acl/kerberos_ldap_group/support_lserver.cc b/helpers/external_acl/kerberos_ldap_group/support_lserver.cc index 0c08275404..c855c865e3 100644 --- a/helpers/external_acl/kerberos_ldap_group/support_lserver.cc +++ b/helpers/external_acl/kerberos_ldap_group/support_lserver.cc @@ -22,7 +22,7 @@ * ----------------------------------------------------------------------------- */ -#include "config.h" +#include "squid.h" #include "util.h" #ifdef HAVE_LDAP diff --git a/helpers/external_acl/kerberos_ldap_group/support_member.cc b/helpers/external_acl/kerberos_ldap_group/support_member.cc index 5d0b54f76f..a8af1ee7b4 100644 --- a/helpers/external_acl/kerberos_ldap_group/support_member.cc +++ b/helpers/external_acl/kerberos_ldap_group/support_member.cc @@ -22,7 +22,7 @@ * ----------------------------------------------------------------------------- */ -#include "config.h" +#include "squid.h" #include "util.h" #ifdef HAVE_LDAP diff --git a/helpers/external_acl/kerberos_ldap_group/support_netbios.cc b/helpers/external_acl/kerberos_ldap_group/support_netbios.cc index fa9d64b78f..0b608fb81c 100644 --- a/helpers/external_acl/kerberos_ldap_group/support_netbios.cc +++ b/helpers/external_acl/kerberos_ldap_group/support_netbios.cc @@ -22,7 +22,7 @@ * ----------------------------------------------------------------------------- */ -#include "config.h" +#include "squid.h" #include "util.h" #ifdef HAVE_LDAP diff --git a/helpers/external_acl/kerberos_ldap_group/support_resolv.cc b/helpers/external_acl/kerberos_ldap_group/support_resolv.cc index f07d465c57..bbe19509a8 100644 --- a/helpers/external_acl/kerberos_ldap_group/support_resolv.cc +++ b/helpers/external_acl/kerberos_ldap_group/support_resolv.cc @@ -22,7 +22,7 @@ * ----------------------------------------------------------------------------- */ -#include "config.h" +#include "squid.h" #include "util.h" #ifdef HAVE_LDAP diff --git a/helpers/external_acl/kerberos_ldap_group/support_sasl.cc b/helpers/external_acl/kerberos_ldap_group/support_sasl.cc index 0ef22ff126..d6f37f02e0 100644 --- a/helpers/external_acl/kerberos_ldap_group/support_sasl.cc +++ b/helpers/external_acl/kerberos_ldap_group/support_sasl.cc @@ -22,7 +22,7 @@ * ----------------------------------------------------------------------------- */ -#include "config.h" +#include "squid.h" #include "util.h" #ifdef HAVE_LDAP diff --git a/helpers/external_acl/session/ext_session_acl.cc b/helpers/external_acl/session/ext_session_acl.cc index 93b5937162..f63a7b86ce 100644 --- a/helpers/external_acl/session/ext_session_acl.cc +++ b/helpers/external_acl/session/ext_session_acl.cc @@ -19,7 +19,7 @@ */ #if HAVE_CONFIG_H -#include "config.h" +#include "squid.h" #endif #include "helpers/defines.h" diff --git a/helpers/external_acl/time_quota/ext_time_quota_acl.cc b/helpers/external_acl/time_quota/ext_time_quota_acl.cc index 5d8ff1df07..e5869e2e97 100644 --- a/helpers/external_acl/time_quota/ext_time_quota_acl.cc +++ b/helpers/external_acl/time_quota/ext_time_quota_acl.cc @@ -19,7 +19,7 @@ */ #if HAVE_CONFIG_H -#include "config.h" +#include "squid.h" #endif #include "helpers/defines.h" diff --git a/helpers/external_acl/unix_group/check_group.cc b/helpers/external_acl/unix_group/check_group.cc index 8dad8e7952..b5cdecc7f3 100644 --- a/helpers/external_acl/unix_group/check_group.cc +++ b/helpers/external_acl/unix_group/check_group.cc @@ -55,7 +55,7 @@ * Initial revision * */ -#include "config.h" +#include "squid.h" #include "helpers/defines.h" #include "rfc1738.h" #include "util.h" @@ -80,7 +80,7 @@ #endif /* - * Verify if user´s primary group matches groupname + * Verify if user�s primary group matches groupname * Returns 0 if user is not on the group * Returns 1 otherwise */ diff --git a/helpers/log_daemon/file/log_file_daemon.cc b/helpers/log_daemon/file/log_file_daemon.cc index 48cd3782b9..ee4c7c0008 100644 --- a/helpers/log_daemon/file/log_file_daemon.cc +++ b/helpers/log_daemon/file/log_file_daemon.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #if HAVE_STDIO_H #include diff --git a/helpers/negotiate_auth/SSPI/negotiate_sspi_auth.cc b/helpers/negotiate_auth/SSPI/negotiate_sspi_auth.cc index d1d86c9b9d..0356680523 100644 --- a/helpers/negotiate_auth/SSPI/negotiate_sspi_auth.cc +++ b/helpers/negotiate_auth/SSPI/negotiate_sspi_auth.cc @@ -36,7 +36,7 @@ * * */ -#include "config.h" +#include "squid.h" #include "helpers/defines.h" #include "libntlmauth/support_bits.cci" #include "sspwin32.h" diff --git a/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc b/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc index 7d3696abc5..e383387412 100644 --- a/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc +++ b/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc @@ -29,7 +29,7 @@ /* * Hosted at http://sourceforge.net/projects/squidkerbauth */ -#include "config.h" +#include "squid.h" #include "compat/getaddrinfo.h" #include "compat/getnameinfo.h" diff --git a/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth_test.cc b/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth_test.cc index e7de2eaca1..4660bdc850 100644 --- a/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth_test.cc +++ b/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth_test.cc @@ -25,7 +25,7 @@ * Hosted at http://sourceforge.net/projects/squidkerbauth */ -#include "config.h" +#include "squid.h" #if HAVE_GSSAPI diff --git a/helpers/negotiate_auth/wrapper/negotiate_wrapper.cc b/helpers/negotiate_auth/wrapper/negotiate_wrapper.cc index dbee8cfe50..0300edc56e 100644 --- a/helpers/negotiate_auth/wrapper/negotiate_wrapper.cc +++ b/helpers/negotiate_auth/wrapper/negotiate_wrapper.cc @@ -25,7 +25,7 @@ * Hosted at http://sourceforge.net/projects/squidkerbauth */ -#include "config.h" +#include "squid.h" #include "base64.h" #if HAVE_STRING_H diff --git a/helpers/ntlm_auth/SSPI/ntlm_sspi_auth.cc b/helpers/ntlm_auth/SSPI/ntlm_sspi_auth.cc index 857f80f171..5f209ca2f6 100644 --- a/helpers/ntlm_auth/SSPI/ntlm_sspi_auth.cc +++ b/helpers/ntlm_auth/SSPI/ntlm_sspi_auth.cc @@ -63,7 +63,7 @@ typedef unsigned char uchar; -#include "config.h" +#include "squid.h" #include "helpers/defines.h" #include "libntlmauth/ntlmauth.h" #include "libntlmauth/support_bits.h" diff --git a/helpers/ntlm_auth/fake/ntlm_fake_auth.cc b/helpers/ntlm_auth/fake/ntlm_fake_auth.cc index 388319c83d..8f5a6411c8 100644 --- a/helpers/ntlm_auth/fake/ntlm_fake_auth.cc +++ b/helpers/ntlm_auth/fake/ntlm_fake_auth.cc @@ -53,7 +53,7 @@ * that though */ #define IGNORANCE_IS_BLISS -#include "config.h" +#include "squid.h" #include "base64.h" #include "helpers/defines.h" #include "ntlmauth/ntlmauth.h" diff --git a/helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.cc b/helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.cc index 77905e2a8e..981600e0e3 100644 --- a/helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.cc +++ b/helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.cc @@ -13,7 +13,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * */ -#include "config.h" +#include "squid.h" #include "base64.h" #include "compat/debug.h" #include "ntlmauth/ntlmauth.h" diff --git a/helpers/url_rewrite/fake/fake.cc b/helpers/url_rewrite/fake/fake.cc index 936d2fb959..d18053c40d 100644 --- a/helpers/url_rewrite/fake/fake.cc +++ b/helpers/url_rewrite/fake/fake.cc @@ -12,7 +12,7 @@ * squid under the same conditions as the main squid application. */ -#include "config.h" +#include "squid.h" #include "helpers/defines.h" #if HAVE_CSTRING diff --git a/include/config.h b/include/squid.h similarity index 100% rename from include/config.h rename to include/squid.h diff --git a/lib/Array.cc b/lib/Array.cc index b594bef46c..efab8f51ff 100644 --- a/lib/Array.cc +++ b/lib/Array.cc @@ -40,7 +40,7 @@ */ -#include "config.h" +#include "squid.h" #include "Array.h" #if HAVE_ASSERT_H diff --git a/lib/MemPool.cc b/lib/MemPool.cc index 3e6143af90..5b7b354166 100644 --- a/lib/MemPool.cc +++ b/lib/MemPool.cc @@ -33,7 +33,7 @@ * */ -#include "config.h" +#include "squid.h" #if HAVE_ASSERT_H #include #endif diff --git a/lib/MemPoolChunked.cc b/lib/MemPoolChunked.cc index 6485b426b6..8068513a7f 100644 --- a/lib/MemPoolChunked.cc +++ b/lib/MemPoolChunked.cc @@ -81,7 +81,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "config.h" +#include "squid.h" #if HAVE_ASSERT_H #include #endif diff --git a/lib/MemPoolMalloc.cc b/lib/MemPoolMalloc.cc index 75759932da..8d9ead1b36 100644 --- a/lib/MemPoolMalloc.cc +++ b/lib/MemPoolMalloc.cc @@ -34,7 +34,7 @@ */ -#include "config.h" +#include "squid.h" #if HAVE_ASSERT_H #include #endif diff --git a/lib/Splay.cc b/lib/Splay.cc index ed4b436716..50ccc35da7 100644 --- a/lib/Splay.cc +++ b/lib/Splay.cc @@ -5,7 +5,7 @@ * http://bobo.link.cs.cmu.edu/cgi-bin/splay/splay-cgi.pl */ -#include "config.h" +#include "squid.h" #if HAVE_STDIO_H #include diff --git a/lib/base64.c b/lib/base64.c index 2881ca0529..b21e519d56 100644 --- a/lib/base64.c +++ b/lib/base64.c @@ -6,7 +6,7 @@ * Encoders adopted from http://ftp.sunet.se/pub2/gnu/vm/base64-encode.c with adjustments. */ -#include "config.h" +#include "squid.h" #include "base64.h" #if HAVE_STDIO_H diff --git a/lib/charset.c b/lib/charset.c index b58b535dc5..d04f5d7ac4 100644 --- a/lib/charset.c +++ b/lib/charset.c @@ -25,7 +25,7 @@ * */ -#include "config.h" +#include "squid.h" #include "charset.h" /** Convert ISO-LATIN-1 to UTF-8 */ diff --git a/lib/dirent.c b/lib/dirent.c index 392031d911..cc3c2c322d 100644 --- a/lib/dirent.c +++ b/lib/dirent.c @@ -48,7 +48,7 @@ * */ -#include "config.h" +#include "squid.h" /* The following code section is part of the native Windows Squid port */ #if _SQUID_MSWIN_ diff --git a/lib/encrypt.c b/lib/encrypt.c index 2746bf2e04..75a6a117ce 100644 --- a/lib/encrypt.c +++ b/lib/encrypt.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" /* encrypt.c - providing 56 bit DES encryption * Copyright (C) 1991 Jochen Obalek diff --git a/lib/getfullhostname.c b/lib/getfullhostname.c index 3a8915cf39..3c12e3484f 100644 --- a/lib/getfullhostname.c +++ b/lib/getfullhostname.c @@ -31,7 +31,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * */ -#include "config.h" +#include "squid.h" #include "getfullhostname.h" diff --git a/lib/getopt.c b/lib/getopt.c index 6500e6d9e8..e95fbc94c4 100644 --- a/lib/getopt.c +++ b/lib/getopt.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" /* * Copyright (c) 1987, 1993, 1994 diff --git a/lib/hash.c b/lib/hash.c index f962ad2548..68c5e30514 100644 --- a/lib/hash.c +++ b/lib/hash.c @@ -33,7 +33,7 @@ * */ -#include "config.h" +#include "squid.h" #include "hash.h" #include "profiler/Profiler.h" diff --git a/lib/heap.c b/lib/heap.c index 8226d88ca8..35f3fbc26b 100644 --- a/lib/heap.c +++ b/lib/heap.c @@ -37,7 +37,7 @@ * Copyright (C) 1999 by Hewlett Packard ****************************************************************************/ -#include "config.h" +#include "squid.h" #include "heap.h" #if HAVE_STDLIB_H diff --git a/lib/html_quote.c b/lib/html_quote.c index bd9bee06b3..61ebae955c 100644 --- a/lib/html_quote.c +++ b/lib/html_quote.c @@ -32,7 +32,7 @@ * */ -#include "config.h" +#include "squid.h" #include "html_quote.h" #if HAVE_STDIO_H diff --git a/lib/iso3307.c b/lib/iso3307.c index 1d1491bd61..3b90f87d4d 100644 --- a/lib/iso3307.c +++ b/lib/iso3307.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "util.h" #if HAVE_STDIO_H diff --git a/lib/libTrie/test/trie-c.c b/lib/libTrie/test/trie-c.c index 0f77a7d664..e9ceff4dc3 100644 --- a/lib/libTrie/test/trie-c.c +++ b/lib/libTrie/test/trie-c.c @@ -17,7 +17,7 @@ * */ -#include "config.h" +#include "squid.h" #include "Trie.h" #include diff --git a/lib/malloc_trace.cc b/lib/malloc_trace.cc index 4d107b60d3..ad5f8e8dc5 100644 --- a/lib/malloc_trace.cc +++ b/lib/malloc_trace.cc @@ -34,7 +34,7 @@ #define _etext etext -#include "config.h" +#include "squid.h" #include "profiler/Profiler.h" #include "util.h" diff --git a/lib/md5-test.c b/lib/md5-test.c index aa10c97f82..c6fa9f2507 100644 --- a/lib/md5-test.c +++ b/lib/md5-test.c @@ -7,7 +7,7 @@ * gcc -Wall md5-test.c -I../include md5.o */ -#include "config.h" +#include "squid.h" #include "md5.h" #include "stdio.h" diff --git a/lib/md5.c b/lib/md5.c index 6df0ce5256..2985473d81 100644 --- a/lib/md5.c +++ b/lib/md5.c @@ -29,7 +29,7 @@ * Still in the public domain. * */ -#include "config.h" +#include "squid.h" #include "md5.h" #if HAVE_STRING_H diff --git a/lib/ntlmauth/ntlmauth.cc b/lib/ntlmauth/ntlmauth.cc index a53900c994..b29b85824e 100644 --- a/lib/ntlmauth/ntlmauth.cc +++ b/lib/ntlmauth/ntlmauth.cc @@ -25,7 +25,7 @@ * */ -#include "config.h" +#include "squid.h" #if HAVE_STRING_H #include diff --git a/lib/profiler/Profiler.cc b/lib/profiler/Profiler.cc index 1c01ecdfe1..a608ae888e 100644 --- a/lib/profiler/Profiler.cc +++ b/lib/profiler/Profiler.cc @@ -113,7 +113,7 @@ * */ -#include "config.h" +#include "squid.h" #include "profiler/Profiler.h" #if USE_XPROF_STATS diff --git a/lib/radix.c b/lib/radix.c index b9587a8b84..512b31a495 100644 --- a/lib/radix.c +++ b/lib/radix.c @@ -64,7 +64,7 @@ * @(#)radix.c 8.4 (Berkeley) 11/2/94 */ -#include "config.h" +#include "squid.h" #include "radix.h" #include "util.h" diff --git a/lib/rfc1035.c b/lib/rfc1035.c index 898d37be6e..6afc3dff62 100644 --- a/lib/rfc1035.c +++ b/lib/rfc1035.c @@ -38,7 +38,7 @@ * UDP replies with TC set should be retried via TCP */ -#include "config.h" +#include "squid.h" #include "util.h" #if HAVE_STDIO_H diff --git a/lib/rfc1123.c b/lib/rfc1123.c index 1c16e88bfa..e877bef046 100644 --- a/lib/rfc1123.c +++ b/lib/rfc1123.c @@ -32,7 +32,7 @@ * */ -#include "config.h" +#include "squid.h" #include "rfc1123.h" /* diff --git a/lib/rfc1738.c b/lib/rfc1738.c index d5060fe844..add49ff1a3 100644 --- a/lib/rfc1738.c +++ b/lib/rfc1738.c @@ -32,7 +32,7 @@ * */ -#include "config.h" +#include "squid.h" #include "rfc1738.h" #if HAVE_STDIO_H diff --git a/lib/rfc2617.c b/lib/rfc2617.c index f7530d6c55..9cda349976 100644 --- a/lib/rfc2617.c +++ b/lib/rfc2617.c @@ -46,7 +46,7 @@ * */ -#include "config.h" +#include "squid.h" #include #include "rfc2617.h" #include "md5.h" diff --git a/lib/rfc2671.c b/lib/rfc2671.c index f33503138d..b53a238e3a 100644 --- a/lib/rfc2671.c +++ b/lib/rfc2671.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "rfc2671.h" #include "rfc1035.h" diff --git a/lib/rfc3596.c b/lib/rfc3596.c index fa929cb4ca..fad37024a5 100644 --- a/lib/rfc3596.c +++ b/lib/rfc3596.c @@ -55,7 +55,7 @@ * */ -#include "config.h" +#include "squid.h" #include "compat/inet_pton.h" #include "util.h" diff --git a/lib/rfcnb/rfcnb-io.c b/lib/rfcnb/rfcnb-io.c index 06786c4e46..219f56239b 100644 --- a/lib/rfcnb/rfcnb-io.c +++ b/lib/rfcnb/rfcnb-io.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" /* UNIX RFCNB (RFC1001/RFC1002) NEtBIOS implementation * diff --git a/lib/rfcnb/rfcnb-util.c b/lib/rfcnb/rfcnb-util.c index c28f43fa7f..79a9f4d0c5 100644 --- a/lib/rfcnb/rfcnb-util.c +++ b/lib/rfcnb/rfcnb-util.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" /* UNIX RFCNB (RFC1001/RFC1002) NetBIOS implementation * diff --git a/lib/rfcnb/session.c b/lib/rfcnb/session.c index 0a4878e3fe..58ee6b190b 100644 --- a/lib/rfcnb/session.c +++ b/lib/rfcnb/session.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" /* UNIX RFCNB (RFC1001/RFC1002) NetBIOS implementation * diff --git a/lib/smblib/bad-chain.c b/lib/smblib/bad-chain.c index 388a7f1de3..4b7b237a2a 100644 --- a/lib/smblib/bad-chain.c +++ b/lib/smblib/bad-chain.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" /* UNIX SMBlib NetBIOS implementation Version 1.0 diff --git a/lib/smblib/exper.c b/lib/smblib/exper.c index dcfbc36ce8..a67de30a28 100644 --- a/lib/smblib/exper.c +++ b/lib/smblib/exper.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" /* UNIX SMBlib NetBIOS implementation Version 1.0 diff --git a/lib/smblib/file.c b/lib/smblib/file.c index da841331f0..f0cedca6a5 100644 --- a/lib/smblib/file.c +++ b/lib/smblib/file.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" /* UNIX SMBlib NetBIOS implementation Version 1.0 diff --git a/lib/smblib/find_password.c b/lib/smblib/find_password.c index a61dc61a88..ae31034897 100644 --- a/lib/smblib/find_password.c +++ b/lib/smblib/find_password.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" /* Find passwords ... */ /* We do it in a brute force way ... Cycle through all the possible passwords sending a logon to see if all it works ... We have to wait for any timeout diff --git a/lib/smblib/md4.c b/lib/smblib/md4.c index 27e4668068..1cfb224a6e 100644 --- a/lib/smblib/md4.c +++ b/lib/smblib/md4.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" /* * Unix SMB/Netbios implementation. diff --git a/lib/smblib/smb-errors.c b/lib/smblib/smb-errors.c index c48ee3195c..ea857864d6 100644 --- a/lib/smblib/smb-errors.c +++ b/lib/smblib/smb-errors.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" /* UNIX SMBlib NetBIOS implementation diff --git a/lib/smblib/smbdes.c b/lib/smblib/smbdes.c index e5b8b30b2c..47f1be256b 100644 --- a/lib/smblib/smbdes.c +++ b/lib/smblib/smbdes.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" /* * Unix SMB/Netbios implementation. diff --git a/lib/smblib/smbencrypt.c b/lib/smblib/smbencrypt.c index 9afce50b54..7efdeac8a9 100644 --- a/lib/smblib/smbencrypt.c +++ b/lib/smblib/smbencrypt.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" /* * Unix SMB/Netbios implementation. diff --git a/lib/smblib/smblib-api.c b/lib/smblib/smblib-api.c index b02894780b..9604daee2f 100644 --- a/lib/smblib/smblib-api.c +++ b/lib/smblib/smblib-api.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" /* UNIX SMBlib NetBIOS implementation Version 1.0 diff --git a/lib/smblib/smblib-util.c b/lib/smblib/smblib-util.c index b556be0b38..1040fd433b 100644 --- a/lib/smblib/smblib-util.c +++ b/lib/smblib/smblib-util.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" /* UNIX SMBlib NetBIOS implementation diff --git a/lib/smblib/smblib.c b/lib/smblib/smblib.c index 45ff27a88d..d32406a5e9 100644 --- a/lib/smblib/smblib.c +++ b/lib/smblib/smblib.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" /* UNIX SMBlib NetBIOS implementation diff --git a/lib/sspwin32.c b/lib/sspwin32.c index ea657eb2e1..434d97296a 100644 --- a/lib/sspwin32.c +++ b/lib/sspwin32.c @@ -33,7 +33,7 @@ * */ -#include "config.h" +#include "squid.h" #include "util.h" #include "libntlmauth/ntlmauth.h" diff --git a/lib/stub_memaccount.c b/lib/stub_memaccount.c index c49afc4a98..c81d9fb33f 100644 --- a/lib/stub_memaccount.c +++ b/lib/stub_memaccount.c @@ -3,7 +3,7 @@ */ /* Stub function for programs not implementing statMemoryAccounted */ -#include "config.h" +#include "squid.h" #include "util.h" int statMemoryAccounted(void) diff --git a/lib/tests/testArray.cc b/lib/tests/testArray.cc index 6e46be9218..ffbfebbc5a 100644 --- a/lib/tests/testArray.cc +++ b/lib/tests/testArray.cc @@ -1,5 +1,5 @@ #define SQUID_UNIT_TEST 1 -#include "config.h" +#include "squid.h" #if HAVE_ASSERT_H #include diff --git a/lib/tests/testMain.cc b/lib/tests/testMain.cc index 08902d88fb..14febc501d 100644 --- a/lib/tests/testMain.cc +++ b/lib/tests/testMain.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include #include diff --git a/lib/tests/testRFC1035.cc b/lib/tests/testRFC1035.cc index 85920bb204..6902ff8c47 100644 --- a/lib/tests/testRFC1035.cc +++ b/lib/tests/testRFC1035.cc @@ -1,5 +1,5 @@ #define SQUID_UNIT_TEST 1 -#include "config.h" +#include "squid.h" #if HAVE_ASSERT_H #include diff --git a/lib/tests/testRFC1738.cc b/lib/tests/testRFC1738.cc index d989bad82b..35d301c40a 100644 --- a/lib/tests/testRFC1738.cc +++ b/lib/tests/testRFC1738.cc @@ -1,5 +1,5 @@ #define SQUID_UNIT_TEST 1 -#include "config.h" +#include "squid.h" #if HAVE_ASSERT_H #include diff --git a/lib/util.c b/lib/util.c index b1fd1ccdc6..4824b0ce5e 100644 --- a/lib/util.c +++ b/lib/util.c @@ -34,7 +34,7 @@ #define _etext etext -#include "config.h" +#include "squid.h" #include "profiler/Profiler.h" #include "util.h" diff --git a/lib/uudecode.c b/lib/uudecode.c index a9f5f94a77..7ad886ac0a 100644 --- a/lib/uudecode.c +++ b/lib/uudecode.c @@ -2,7 +2,7 @@ * $Id$ */ -#include "config.h" +#include "squid.h" #include "uudecode.h" /* aaaack but it's fast and const should make it shared text page. */ diff --git a/lib/xusleep.c b/lib/xusleep.c index d4490a3a01..d5e4bc5068 100644 --- a/lib/xusleep.c +++ b/lib/xusleep.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "profiler/Profiler.h" #include "xusleep.h" diff --git a/scripts/source-maintenance.sh b/scripts/source-maintenance.sh index 0750ba797b..e1aa5010a9 100755 --- a/scripts/source-maintenance.sh +++ b/scripts/source-maintenance.sh @@ -73,14 +73,14 @@ for FILENAME in `ls -1`; do case ${FILENAME} in *.c|*.cc) FI=`grep "#include" ${FILENAME} | head -1`; - if test "${FI}" != "#include \"config.h\"" -a "${FI}" != "#include \"squid.h\"" -a "${FILENAME}" != "cf_gen.cc"; then - echo "ERROR: ${PWD}/${FILENAME} does not include config.h or squid.h first!" + if test "${FI}" != "#include \"squid.h\"" -a "${FI}" != "#include \"squid-old.h\"" -a "${FILENAME}" != "cf_gen.cc"; then + echo "ERROR: ${PWD}/${FILENAME} does not include squid.h or squid-old.h first!" fi ;; *.h|*.cci) - FI=`grep "#include \"config.h\"" ${FILENAME}`; + FI=`grep "#include \"squid.h\"" ${FILENAME}`; if test "x${FI}" != "x" -a "${FILENAME}" != "squid.h"; then - echo "ERROR: ${PWD}/${FILENAME} duplicate include of config.h" + echo "ERROR: ${PWD}/${FILENAME} duplicate include of squid.h" fi ;; esac diff --git a/snmplib/asn1.c b/snmplib/asn1.c index 46b154ac5a..def1fad362 100644 --- a/snmplib/asn1.c +++ b/snmplib/asn1.c @@ -31,7 +31,7 @@ * ***************************************************************************/ -#include "config.h" +#include "squid.h" #include diff --git a/snmplib/coexistance.c b/snmplib/coexistance.c index 429d78d77f..2f6ba7e434 100644 --- a/snmplib/coexistance.c +++ b/snmplib/coexistance.c @@ -27,9 +27,9 @@ * **********************************************************************/ -#include "config.h" +#include "squid.h" -#include "config.h" +#include "squid.h" #include diff --git a/snmplib/mib.c b/snmplib/mib.c index 021c70a5a7..7456e3f4a0 100644 --- a/snmplib/mib.c +++ b/snmplib/mib.c @@ -22,7 +22,7 @@ SOFTWARE. ******************************************************************/ #define SQUID_NO_STRING_BUFFER_PROTECT 1 -#include "config.h" +#include "squid.h" #include diff --git a/snmplib/parse.c b/snmplib/parse.c index cad1cc31e0..a9316d1490 100644 --- a/snmplib/parse.c +++ b/snmplib/parse.c @@ -23,7 +23,7 @@ SOFTWARE. /* * parse.c */ -#include "config.h" +#include "squid.h" #include diff --git a/snmplib/snmp_api.c b/snmplib/snmp_api.c index c22d7e9a74..a512df5f5c 100644 --- a/snmplib/snmp_api.c +++ b/snmplib/snmp_api.c @@ -24,7 +24,7 @@ * **********************************************************************/ -#include "config.h" +#include "squid.h" #include diff --git a/snmplib/snmp_api_error.c b/snmplib/snmp_api_error.c index e9a23e0094..f5629a77a7 100644 --- a/snmplib/snmp_api_error.c +++ b/snmplib/snmp_api_error.c @@ -31,7 +31,7 @@ ***************************************************************************/ #if HAVE_CONFIG_H -#include "config.h" +#include "squid.h" #endif /* HAVE_CONFIG_H */ #include diff --git a/snmplib/snmp_error.c b/snmplib/snmp_error.c index a68d4dbfa0..86a6c54bcf 100644 --- a/snmplib/snmp_error.c +++ b/snmplib/snmp_error.c @@ -26,7 +26,7 @@ * **********************************************************************/ -#include "config.h" +#include "squid.h" #include diff --git a/snmplib/snmp_msg.c b/snmplib/snmp_msg.c index 2fb85665b5..25d84dcff6 100644 --- a/snmplib/snmp_msg.c +++ b/snmplib/snmp_msg.c @@ -33,7 +33,7 @@ * **********************************************************************/ -#include "config.h" +#include "squid.h" #include diff --git a/snmplib/snmp_pdu.c b/snmplib/snmp_pdu.c index 0acbf7eab2..8a7c2a437e 100644 --- a/snmplib/snmp_pdu.c +++ b/snmplib/snmp_pdu.c @@ -33,7 +33,7 @@ * **********************************************************************/ -#include "config.h" +#include "squid.h" #include diff --git a/snmplib/snmp_vars.c b/snmplib/snmp_vars.c index f438d0348c..c5383bcccb 100644 --- a/snmplib/snmp_vars.c +++ b/snmplib/snmp_vars.c @@ -32,7 +32,7 @@ * **********************************************************************/ -#include "config.h" +#include "squid.h" #include diff --git a/snmplib/snmplib_debug.c b/snmplib/snmplib_debug.c index 8e398ccbdf..d6e5534e29 100644 --- a/snmplib/snmplib_debug.c +++ b/snmplib/snmplib_debug.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #if HAVE_STDIO_H #include #endif diff --git a/src/AccessLogEntry.cc b/src/AccessLogEntry.cc index 96b4410c20..d2dca0cfe5 100644 --- a/src/AccessLogEntry.cc +++ b/src/AccessLogEntry.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "AccessLogEntry.h" #include "HttpRequest.h" diff --git a/src/AclRegs.cc b/src/AclRegs.cc index ae4faabb4a..0311820226 100644 --- a/src/AclRegs.cc +++ b/src/AclRegs.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" /** This file exists to provide satic registration code to executables that need ACLs. We cannot place this code in acl/lib*.la because it diff --git a/src/AsyncEngine.cc b/src/AsyncEngine.cc index affe914be2..392db37938 100644 --- a/src/AsyncEngine.cc +++ b/src/AsyncEngine.cc @@ -31,5 +31,5 @@ * */ -#include "config.h" +#include "squid.h" #include "AsyncEngine.h" diff --git a/src/AsyncEngine.h b/src/AsyncEngine.h index f0e5edb380..35f42146b2 100644 --- a/src/AsyncEngine.h +++ b/src/AsyncEngine.h @@ -34,7 +34,7 @@ #ifndef SQUID_ASYNCENGINE_H #define SQUID_ASYNCENGINE_H -#include "squid.h" +#include "squid-old.h" /* Abstract interface for async engines which an event loop can utilise. diff --git a/src/AuthReg.cc b/src/AuthReg.cc index a08726129d..3cde989372 100644 --- a/src/AuthReg.cc +++ b/src/AuthReg.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #if USE_AUTH diff --git a/src/BodyPipe.cc b/src/BodyPipe.cc index 2a543ee2a8..bdbe3a37a2 100644 --- a/src/BodyPipe.cc +++ b/src/BodyPipe.cc @@ -1,5 +1,5 @@ -#include "squid.h" +#include "squid-old.h" #include "base/AsyncJobCalls.h" #include "base/TextException.h" #include "BodyPipe.h" diff --git a/src/CacheDigest.cc b/src/CacheDigest.cc index eb4826df3b..b2f2cdb971 100644 --- a/src/CacheDigest.cc +++ b/src/CacheDigest.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "StatCounters.h" #include "Store.h" diff --git a/src/ChunkedCodingParser.cc b/src/ChunkedCodingParser.cc index bd2fdd1cde..3b99f4ef8c 100644 --- a/src/ChunkedCodingParser.cc +++ b/src/ChunkedCodingParser.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #include "base/TextException.h" #include "Parsing.h" #include "ChunkedCodingParser.h" diff --git a/src/ClientDelayConfig.cc b/src/ClientDelayConfig.cc index 61335b03f9..88db3b6d77 100644 --- a/src/ClientDelayConfig.cc +++ b/src/ClientDelayConfig.cc @@ -1,5 +1,5 @@ -#include "config.h" #include "squid.h" +#include "squid-old.h" #include "ConfigParser.h" #include "ClientDelayConfig.h" #include "Parsing.h" diff --git a/src/CommCalls.cc b/src/CommCalls.cc index a75f33bc8c..b080f2f63b 100644 --- a/src/CommCalls.cc +++ b/src/CommCalls.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #include "fde.h" #include "comm/Connection.h" #include "CommCalls.h" diff --git a/src/CommRead.h b/src/CommRead.h index e206822db5..ba5ff3bbd7 100644 --- a/src/CommRead.h +++ b/src/CommRead.h @@ -36,7 +36,7 @@ #ifndef COMMREAD_H #define COMMREAD_H -#include "squid.h" +#include "squid-old.h" #include "comm.h" #include "CommCalls.h" #include "comm/forward.h" diff --git a/src/CommonPool.h b/src/CommonPool.h index c18c85beb6..45f1c5c334 100644 --- a/src/CommonPool.h +++ b/src/CommonPool.h @@ -39,7 +39,7 @@ #define COMMONPOOL_H #if USE_DELAY_POOLS -#include "squid.h" +#include "squid-old.h" #include "SquidString.h" #include "CompositePoolNode.h" diff --git a/src/CompletionDispatcher.cc b/src/CompletionDispatcher.cc index e52ca5b0d0..8ebca33f49 100644 --- a/src/CompletionDispatcher.cc +++ b/src/CompletionDispatcher.cc @@ -31,5 +31,5 @@ * */ -#include "config.h" +#include "squid.h" #include "CompletionDispatcher.h" diff --git a/src/CompletionDispatcher.h b/src/CompletionDispatcher.h index 456110731e..e5b6d578df 100644 --- a/src/CompletionDispatcher.h +++ b/src/CompletionDispatcher.h @@ -34,7 +34,7 @@ #ifndef SQUID_COMPLETIONDISPATCHER_H #define SQUID_COMPLETIONDISPATCHER_H -#include "squid.h" +#include "squid-old.h" /* Dispatch code to handle events that have completed. Completed events are queued diff --git a/src/CompositePoolNode.h b/src/CompositePoolNode.h index d515603a64..afdae833e9 100644 --- a/src/CompositePoolNode.h +++ b/src/CompositePoolNode.h @@ -37,7 +37,7 @@ #define COMPOSITEPOOLNODE_H #if USE_DELAY_POOLS -#include "squid.h" +#include "squid-old.h" #include "auth/UserRequest.h" #include "DelayPools.h" #include "DelayIdComposite.h" diff --git a/src/ConfigOption.cc b/src/ConfigOption.cc index 6cd1deece7..74306f9729 100644 --- a/src/ConfigOption.cc +++ b/src/ConfigOption.cc @@ -32,7 +32,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "ConfigOption.h" ConfigOptionVector::~ConfigOptionVector() diff --git a/src/ConfigParser.cc b/src/ConfigParser.cc index c04aef5cd4..0a4ad36e7b 100644 --- a/src/ConfigParser.cc +++ b/src/ConfigParser.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "config.h" +#include "squid.h" #include "ConfigParser.h" #include "globals.h" diff --git a/src/ConfigParser.h b/src/ConfigParser.h index 99fd894a07..f4836a00d9 100644 --- a/src/ConfigParser.h +++ b/src/ConfigParser.h @@ -36,7 +36,7 @@ #ifndef SQUID_CONFIGPARSER_H #define SQUID_CONFIGPARSER_H -#include "squid.h" +#include "squid-old.h" /** * Limit to how long any given config line may be. diff --git a/src/CpuAffinity.cc b/src/CpuAffinity.cc index ca061a8ec4..da5274a06d 100644 --- a/src/CpuAffinity.cc +++ b/src/CpuAffinity.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "CpuAffinity.h" #include "CpuAffinityMap.h" diff --git a/src/CpuAffinityMap.cc b/src/CpuAffinityMap.cc index 36b2f2aeda..b4415a6b80 100644 --- a/src/CpuAffinityMap.cc +++ b/src/CpuAffinityMap.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "CpuAffinityMap.h" #include "CpuAffinitySet.h" diff --git a/src/CpuAffinitySet.cc b/src/CpuAffinitySet.cc index 80e1406357..3cd3dc8697 100644 --- a/src/CpuAffinitySet.cc +++ b/src/CpuAffinitySet.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "CpuAffinitySet.h" #include "Debug.h" diff --git a/src/DelayBucket.cc b/src/DelayBucket.cc index c7722c86da..5249c55f16 100644 --- a/src/DelayBucket.cc +++ b/src/DelayBucket.cc @@ -36,10 +36,10 @@ * Copyright (c) 2003, Robert Collins */ -#include "config.h" +#include "squid.h" #if USE_DELAY_POOLS -#include "squid.h" +#include "squid-old.h" #include "DelayBucket.h" #include "DelaySpec.h" #include "Store.h" diff --git a/src/DelayConfig.cc b/src/DelayConfig.cc index 9f3c1e76d9..43e0bda5d2 100644 --- a/src/DelayConfig.cc +++ b/src/DelayConfig.cc @@ -37,10 +37,10 @@ * Copyright (c) 2003, Robert Collins */ -#include "config.h" +#include "squid.h" #if USE_DELAY_POOLS -#include "squid.h" +#include "squid-old.h" #include "DelayConfig.h" #include "ConfigParser.h" #include "DelayPools.h" diff --git a/src/DelayId.cc b/src/DelayId.cc index 08dba5dd18..66f52ca4d6 100644 --- a/src/DelayId.cc +++ b/src/DelayId.cc @@ -37,14 +37,14 @@ * Copyright (c) 2003, Robert Collins */ -#include "config.h" +#include "squid.h" /* MS Visual Studio Projects are monolithic, so we need the following * #if to exclude the delay pools code from compile process when not needed. */ #if USE_DELAY_POOLS -#include "squid.h" +#include "squid-old.h" #include "DelayId.h" #include "client_side_request.h" #include "acl/FilledChecklist.h" diff --git a/src/DelayIdComposite.h b/src/DelayIdComposite.h index 34138ccbe6..3f12c0b104 100644 --- a/src/DelayIdComposite.h +++ b/src/DelayIdComposite.h @@ -40,7 +40,7 @@ #define DELAYIDCOMPOSITE_H #if USE_DELAY_POOLS -#include "squid.h" +#include "squid-old.h" #include "RefCount.h" class DeferredRead; diff --git a/src/DelayPool.cc b/src/DelayPool.cc index b4871ecc09..2fed607dbe 100644 --- a/src/DelayPool.cc +++ b/src/DelayPool.cc @@ -36,7 +36,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "config.h" +#include "squid.h" #if USE_DELAY_POOLS #include "DelayPool.h" diff --git a/src/DelayPool.h b/src/DelayPool.h index 22d2d73dbf..432418bf2e 100644 --- a/src/DelayPool.h +++ b/src/DelayPool.h @@ -40,7 +40,7 @@ #define DELAYPOOL_H #if USE_DELAY_POOLS -#include "squid.h" +#include "squid-old.h" #include "CompositePoolNode.h" class StoreEntry; diff --git a/src/DelaySpec.cc b/src/DelaySpec.cc index 485cdc34e5..5481a4c24c 100644 --- a/src/DelaySpec.cc +++ b/src/DelaySpec.cc @@ -37,10 +37,10 @@ * Copyright (c) 2003, Robert Collins */ -#include "config.h" +#include "squid.h" #if USE_DELAY_POOLS -#include "squid.h" +#include "squid-old.h" #include "DelaySpec.h" #include "Store.h" #include "Parsing.h" diff --git a/src/DelayTagged.cc b/src/DelayTagged.cc index 5e510a4620..586816bd12 100644 --- a/src/DelayTagged.cc +++ b/src/DelayTagged.cc @@ -35,10 +35,10 @@ * Copyright (c) 2003, Robert Collins */ -#include "config.h" +#include "squid.h" #if USE_DELAY_POOLS -#include "squid.h" +#include "squid-old.h" #include "comm/Connection.h" #include "DelayTagged.h" #include "NullDelayId.h" diff --git a/src/DelayTagged.h b/src/DelayTagged.h index 6bc7ec6439..0335e34ef9 100644 --- a/src/DelayTagged.h +++ b/src/DelayTagged.h @@ -38,7 +38,7 @@ #if USE_DELAY_POOLS -#include "squid.h" +#include "squid-old.h" #include "auth/Gadgets.h" #include "CompositePoolNode.h" #include "DelayIdComposite.h" diff --git a/src/DelayUser.cc b/src/DelayUser.cc index 81eb6245ad..ea72409d5f 100644 --- a/src/DelayUser.cc +++ b/src/DelayUser.cc @@ -35,10 +35,10 @@ * Copyright (c) 2003, Robert Collins */ -#include "config.h" +#include "squid.h" #if USE_DELAY_POOLS && USE_AUTH -#include "squid.h" +#include "squid-old.h" #include "DelayUser.h" #include "auth/UserRequest.h" #include "auth/User.h" diff --git a/src/DelayUser.h b/src/DelayUser.h index 0210e343fb..92fcadc687 100644 --- a/src/DelayUser.h +++ b/src/DelayUser.h @@ -38,7 +38,7 @@ #if USE_DELAY_POOLS && USE_AUTH -#include "squid.h" +#include "squid-old.h" #include "auth/Gadgets.h" #include "auth/User.h" #include "CompositePoolNode.h" diff --git a/src/DelayVector.cc b/src/DelayVector.cc index 0f286446a8..0d434ea9c5 100644 --- a/src/DelayVector.cc +++ b/src/DelayVector.cc @@ -37,10 +37,10 @@ * Copyright (c) 2003, Robert Collins */ -#include "config.h" +#include "squid.h" #if USE_DELAY_POOLS -#include "squid.h" +#include "squid-old.h" #include "comm/Connection.h" #include "DelayVector.h" #include "CommRead.h" diff --git a/src/DescriptorSet.cc b/src/DescriptorSet.cc index f6fa19abc9..18268dc0f2 100644 --- a/src/DescriptorSet.cc +++ b/src/DescriptorSet.cc @@ -3,7 +3,7 @@ * * DEBUG: section 05 Comm */ -#include "config.h" +#include "squid.h" #include "DescriptorSet.h" // pre-allocates descriptor store and index for Squid_MaxFD descriptors diff --git a/src/DescriptorSet.h b/src/DescriptorSet.h index b839a0962a..8e99dfb823 100644 --- a/src/DescriptorSet.h +++ b/src/DescriptorSet.h @@ -1,7 +1,7 @@ #ifndef SQUID_DESCRIPTOR_SET_H #define SQUID_DESCRIPTOR_SET_H -#include "squid.h" +#include "squid-old.h" /** \ingroup Comm diff --git a/src/DiskIO/AIO/AIODiskFile.cc b/src/DiskIO/AIO/AIODiskFile.cc index 99be575f28..fafc127ff0 100644 --- a/src/DiskIO/AIO/AIODiskFile.cc +++ b/src/DiskIO/AIO/AIODiskFile.cc @@ -44,7 +44,7 @@ * per storedir it should work just fine. */ -#include "squid.h" +#include "squid-old.h" #include "AIODiskFile.h" #include "AIODiskIOStrategy.h" #include "DiskIO/IORequestor.h" diff --git a/src/DiskIO/AIO/AIODiskIOModule.cc b/src/DiskIO/AIO/AIODiskIOModule.cc index 9a7811f002..54cd745d0d 100644 --- a/src/DiskIO/AIO/AIODiskIOModule.cc +++ b/src/DiskIO/AIO/AIODiskIOModule.cc @@ -31,7 +31,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "AIODiskIOModule.h" #include "AIODiskIOStrategy.h" #include "Store.h" diff --git a/src/DiskIO/AIO/AIODiskIOStrategy.cc b/src/DiskIO/AIO/AIODiskIOStrategy.cc index 7a946375f8..60847b4831 100644 --- a/src/DiskIO/AIO/AIODiskIOStrategy.cc +++ b/src/DiskIO/AIO/AIODiskIOStrategy.cc @@ -42,7 +42,7 @@ * per storedir it should work just fine. */ -#include "squid.h" +#include "squid-old.h" #include "AIODiskIOStrategy.h" #include "AIODiskFile.h" #include "DiskIO/IORequestor.h" diff --git a/src/DiskIO/AIO/aio_win32.cc b/src/DiskIO/AIO/aio_win32.cc index 6f31515bef..399854f083 100644 --- a/src/DiskIO/AIO/aio_win32.cc +++ b/src/DiskIO/AIO/aio_win32.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "comm.h" #include "aio_win32.h" diff --git a/src/DiskIO/Blocking/BlockingDiskIOModule.cc b/src/DiskIO/Blocking/BlockingDiskIOModule.cc index c446359f94..b1dce0a4f6 100644 --- a/src/DiskIO/Blocking/BlockingDiskIOModule.cc +++ b/src/DiskIO/Blocking/BlockingDiskIOModule.cc @@ -31,7 +31,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "BlockingDiskIOModule.h" #include "BlockingIOStrategy.h" diff --git a/src/DiskIO/Blocking/BlockingFile.cc b/src/DiskIO/Blocking/BlockingFile.cc index d4955ee347..fd92024a48 100644 --- a/src/DiskIO/Blocking/BlockingFile.cc +++ b/src/DiskIO/Blocking/BlockingFile.cc @@ -32,7 +32,7 @@ * * Copyright (c) 2003, Robert Collins */ -#include "config.h" +#include "squid.h" #include "BlockingFile.h" #include "DiskIO/IORequestor.h" #include "DiskIO/ReadRequest.h" diff --git a/src/DiskIO/Blocking/BlockingIOStrategy.cc b/src/DiskIO/Blocking/BlockingIOStrategy.cc index 86100375de..7ce57af323 100644 --- a/src/DiskIO/Blocking/BlockingIOStrategy.cc +++ b/src/DiskIO/Blocking/BlockingIOStrategy.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "config.h" +#include "squid.h" #include "BlockingIOStrategy.h" #include "BlockingFile.h" diff --git a/src/DiskIO/Blocking/DiskIOBlocking.cc b/src/DiskIO/Blocking/DiskIOBlocking.cc index 489a500cfb..e8dde4e601 100644 --- a/src/DiskIO/Blocking/DiskIOBlocking.cc +++ b/src/DiskIO/Blocking/DiskIOBlocking.cc @@ -31,4 +31,4 @@ * Copyright (c) 2003 Robert Collins */ -#include "config.h" +#include "squid.h" diff --git a/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc b/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc index 4e482996d6..8d1cecdac8 100644 --- a/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc +++ b/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc @@ -31,7 +31,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "DiskDaemonDiskIOModule.h" #include "DiskdIOStrategy.h" #include "DiskIO/DiskDaemon/DiskdAction.h" diff --git a/src/DiskIO/DiskDaemon/DiskdAction.cc b/src/DiskIO/DiskDaemon/DiskdAction.cc index 95743e10df..1c141eae5f 100644 --- a/src/DiskIO/DiskDaemon/DiskdAction.cc +++ b/src/DiskIO/DiskDaemon/DiskdAction.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "Store.h" #include "ipc/Messages.h" diff --git a/src/DiskIO/DiskDaemon/DiskdFile.cc b/src/DiskIO/DiskDaemon/DiskdFile.cc index 021e10a70c..af376dcb8c 100644 --- a/src/DiskIO/DiskDaemon/DiskdFile.cc +++ b/src/DiskIO/DiskDaemon/DiskdFile.cc @@ -33,7 +33,7 @@ * CopyRight (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include #include diff --git a/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc b/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc index b509722ae0..1c0b937e5b 100644 --- a/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc +++ b/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "comm/Loops.h" #include diff --git a/src/DiskIO/DiskDaemon/diskd.cc b/src/DiskIO/DiskDaemon/diskd.cc index 3dfbd4e7f2..4f225531c1 100644 --- a/src/DiskIO/DiskDaemon/diskd.cc +++ b/src/DiskIO/DiskDaemon/diskd.cc @@ -32,7 +32,7 @@ * */ -#include "config.h" +#include "squid.h" #include "DiskIO/DiskDaemon/diomsg.h" #include "hash.h" diff --git a/src/DiskIO/DiskFile.h b/src/DiskIO/DiskFile.h index d5f542d45f..4a0a668e3f 100644 --- a/src/DiskIO/DiskFile.h +++ b/src/DiskIO/DiskFile.h @@ -33,7 +33,7 @@ #ifndef SQUID_DISKFILE_H #define SQUID_DISKFILE_H -#include "squid.h" +#include "squid-old.h" #include "RefCount.h" diff --git a/src/DiskIO/DiskIOModule.cc b/src/DiskIO/DiskIOModule.cc index 48a58c9ced..91c84e3f42 100644 --- a/src/DiskIO/DiskIOModule.cc +++ b/src/DiskIO/DiskIOModule.cc @@ -32,7 +32,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "DiskIOModule.h" Vector *DiskIOModule::_Modules = NULL; diff --git a/src/DiskIO/DiskIOModule.h b/src/DiskIO/DiskIOModule.h index bf508d3a83..4dfddeccd3 100644 --- a/src/DiskIO/DiskIOModule.h +++ b/src/DiskIO/DiskIOModule.h @@ -34,7 +34,7 @@ #ifndef SQUID_DISKIOMODULE_H #define SQUID_DISKIOMODULE_H -#include "squid.h" +#include "squid-old.h" #include "Array.h" /* forward decls */ diff --git a/src/DiskIO/DiskIOStrategy.h b/src/DiskIO/DiskIOStrategy.h index 91990d2e46..1f1c8d5bd8 100644 --- a/src/DiskIO/DiskIOStrategy.h +++ b/src/DiskIO/DiskIOStrategy.h @@ -33,7 +33,7 @@ #ifndef SQUID_DISKIOSTRATEGY_H #define SQUID_DISKIOSTRATEGY_H -#include "squid.h" +#include "squid-old.h" #include "RefCount.h" diff --git a/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc b/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc index 4bf6accf33..19cfc6222c 100644 --- a/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc +++ b/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc @@ -34,7 +34,7 @@ */ -#include "squid.h" +#include "squid-old.h" #include "DiskThreadsDiskFile.h" #include "Store.h" #include "Generic.h" diff --git a/src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.cc b/src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.cc index a5bc030b35..fb2509a5c9 100644 --- a/src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.cc +++ b/src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.cc @@ -31,7 +31,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "DiskThreadsDiskIOModule.h" #include "DiskThreadsIOStrategy.h" diff --git a/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc b/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc index c885b29308..e490f392c9 100644 --- a/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc +++ b/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "DiskThreadsDiskFile.h" #include "DiskThreadsIOStrategy.h" diff --git a/src/DiskIO/DiskThreads/aiops.cc b/src/DiskIO/DiskThreads/aiops.cc index 58ada87eb4..1cf652c03f 100644 --- a/src/DiskIO/DiskThreads/aiops.cc +++ b/src/DiskIO/DiskThreads/aiops.cc @@ -36,7 +36,7 @@ #error "_REENTRANT MUST be defined to build squid async io support." #endif -#include "squid.h" +#include "squid-old.h" #include "DiskThreads.h" #include diff --git a/src/DiskIO/DiskThreads/aiops_win32.cc b/src/DiskIO/DiskThreads/aiops_win32.cc index 7fcb2526ae..5afce973a4 100644 --- a/src/DiskIO/DiskThreads/aiops_win32.cc +++ b/src/DiskIO/DiskThreads/aiops_win32.cc @@ -34,7 +34,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "squid_windows.h" #include "CommIO.h" #include "DiskThreads.h" diff --git a/src/DiskIO/DiskThreads/async_io.cc b/src/DiskIO/DiskThreads/async_io.cc index f5a6f1c0bc..f0f56a51cc 100644 --- a/src/DiskIO/DiskThreads/async_io.cc +++ b/src/DiskIO/DiskThreads/async_io.cc @@ -34,7 +34,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "DiskThreads.h" #include "Store.h" #include "fde.h" diff --git a/src/DiskIO/IORequestor.h b/src/DiskIO/IORequestor.h index a0006547b8..739fd0dd7e 100644 --- a/src/DiskIO/IORequestor.h +++ b/src/DiskIO/IORequestor.h @@ -34,7 +34,7 @@ #ifndef SQUID_IOREQUESTOR_H #define SQUID_IOREQUESTOR_H -#include "squid.h" +#include "squid-old.h" #include "RefCount.h" diff --git a/src/DiskIO/IpcIo/IpcIoDiskIOModule.cc b/src/DiskIO/IpcIo/IpcIoDiskIOModule.cc index d0878e43e7..5519da1e11 100644 --- a/src/DiskIO/IpcIo/IpcIoDiskIOModule.cc +++ b/src/DiskIO/IpcIo/IpcIoDiskIOModule.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #include "IpcIoDiskIOModule.h" #include "IpcIoIOStrategy.h" diff --git a/src/DiskIO/IpcIo/IpcIoFile.cc b/src/DiskIO/IpcIo/IpcIoFile.cc index becbf2e9d3..30f9c585f7 100644 --- a/src/DiskIO/IpcIo/IpcIoFile.cc +++ b/src/DiskIO/IpcIo/IpcIoFile.cc @@ -4,7 +4,7 @@ * DEBUG: section 47 Store Directory Routines */ -#include "config.h" +#include "squid.h" #include "base/RunnersRegistry.h" #include "base/TextException.h" #include "DiskIO/IORequestor.h" diff --git a/src/DiskIO/IpcIo/IpcIoIOStrategy.cc b/src/DiskIO/IpcIo/IpcIoIOStrategy.cc index dc3a191ed8..cc38d791df 100644 --- a/src/DiskIO/IpcIo/IpcIoIOStrategy.cc +++ b/src/DiskIO/IpcIo/IpcIoIOStrategy.cc @@ -5,7 +5,7 @@ * DEBUG: section 47 Store Directory Routines */ -#include "config.h" +#include "squid.h" #include "IpcIoFile.h" #include "IpcIoIOStrategy.h" diff --git a/src/DiskIO/Mmapped/MmappedDiskIOModule.cc b/src/DiskIO/Mmapped/MmappedDiskIOModule.cc index 841800446e..4d1b195494 100644 --- a/src/DiskIO/Mmapped/MmappedDiskIOModule.cc +++ b/src/DiskIO/Mmapped/MmappedDiskIOModule.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #include "MmappedDiskIOModule.h" #include "MmappedIOStrategy.h" diff --git a/src/DiskIO/Mmapped/MmappedFile.cc b/src/DiskIO/Mmapped/MmappedFile.cc index 372aa869b9..0b54105c6b 100644 --- a/src/DiskIO/Mmapped/MmappedFile.cc +++ b/src/DiskIO/Mmapped/MmappedFile.cc @@ -4,7 +4,7 @@ * DEBUG: section 47 Store Directory Routines */ -#include "config.h" +#include "squid.h" #include "DiskIO/IORequestor.h" #include "DiskIO/Mmapped/MmappedFile.h" #include "DiskIO/ReadRequest.h" diff --git a/src/DiskIO/Mmapped/MmappedIOStrategy.cc b/src/DiskIO/Mmapped/MmappedIOStrategy.cc index 3f6d68184a..6c6a013f34 100644 --- a/src/DiskIO/Mmapped/MmappedIOStrategy.cc +++ b/src/DiskIO/Mmapped/MmappedIOStrategy.cc @@ -5,7 +5,7 @@ * DEBUG: section 47 Store Directory Routines */ -#include "config.h" +#include "squid.h" #include "MmappedFile.h" #include "MmappedIOStrategy.h" diff --git a/src/DiskIO/ReadRequest.cc b/src/DiskIO/ReadRequest.cc index 91eaf59ebb..edf9dd273a 100644 --- a/src/DiskIO/ReadRequest.cc +++ b/src/DiskIO/ReadRequest.cc @@ -31,7 +31,7 @@ * Copyright (c) 2003 Robert Collins */ -#include "config.h" +#include "squid.h" #include "ReadRequest.h" CBDATA_CLASS_INIT(ReadRequest); diff --git a/src/DiskIO/ReadRequest.h b/src/DiskIO/ReadRequest.h index cbd8bbfc95..87d4be3417 100644 --- a/src/DiskIO/ReadRequest.h +++ b/src/DiskIO/ReadRequest.h @@ -34,7 +34,7 @@ #ifndef SQUID_READREQUEST_H #define SQUID_READREQUEST_H -#include "squid.h" +#include "squid-old.h" #include "cbdata.h" #include "RefCount.h" diff --git a/src/DiskIO/WriteRequest.cc b/src/DiskIO/WriteRequest.cc index df47385e4c..8c4a753067 100644 --- a/src/DiskIO/WriteRequest.cc +++ b/src/DiskIO/WriteRequest.cc @@ -31,7 +31,7 @@ * Copyright (c) 2003 Robert Collins */ -#include "config.h" +#include "squid.h" #include "WriteRequest.h" CBDATA_CLASS_INIT(WriteRequest); diff --git a/src/DiskIO/WriteRequest.h b/src/DiskIO/WriteRequest.h index f41a925f0a..b36b75dc03 100644 --- a/src/DiskIO/WriteRequest.h +++ b/src/DiskIO/WriteRequest.h @@ -34,7 +34,7 @@ #ifndef SQUID_WRITEREQUEST_H #define SQUID_WRITEREQUEST_H -#include "squid.h" +#include "squid-old.h" #include "cbdata.h" #include "RefCount.h" diff --git a/src/DnsLookupDetails.cc b/src/DnsLookupDetails.cc index 8f1f061cf6..435a785af3 100644 --- a/src/DnsLookupDetails.cc +++ b/src/DnsLookupDetails.cc @@ -2,7 +2,7 @@ * DEBUG: section 78 DNS lookups */ -#include "config.h" +#include "squid.h" #include "DnsLookupDetails.h" DnsLookupDetails::DnsLookupDetails(): wait(-1) diff --git a/src/ETag.cc b/src/ETag.cc index b2307b3fa2..ee49a7b292 100644 --- a/src/ETag.cc +++ b/src/ETag.cc @@ -33,7 +33,7 @@ * */ -#include "config.h" +#include "squid.h" #include "ETag.h" #if HAVE_CSTRING diff --git a/src/EventLoop.cc b/src/EventLoop.cc index b281adbc22..15b7d14b54 100644 --- a/src/EventLoop.cc +++ b/src/EventLoop.cc @@ -32,7 +32,7 @@ * */ -#include "config.h" +#include "squid.h" #include "EventLoop.h" #include "base/AsyncCallQueue.h" diff --git a/src/EventLoop.h b/src/EventLoop.h index d709a14723..75df854269 100644 --- a/src/EventLoop.h +++ b/src/EventLoop.h @@ -33,7 +33,7 @@ #ifndef SQUID_EVENTLOOP_H #define SQUID_EVENTLOOP_H -#include "squid.h" +#include "squid-old.h" #include "Array.h" #include "AsyncEngine.h" #include "SquidTime.h" diff --git a/src/ExternalACLEntry.cc b/src/ExternalACLEntry.cc index ade17e63b4..9c7d2dde3b 100644 --- a/src/ExternalACLEntry.cc +++ b/src/ExternalACLEntry.cc @@ -41,7 +41,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "ExternalACLEntry.h" #include "SquidTime.h" diff --git a/src/FadingCounter.cc b/src/FadingCounter.cc index dd6364941d..aad8cdae4d 100644 --- a/src/FadingCounter.cc +++ b/src/FadingCounter.cc @@ -2,7 +2,7 @@ * $Id$ */ -#include "squid.h" +#include "squid-old.h" #include "base/TextException.h" #include "SquidTime.h" #include "FadingCounter.h" diff --git a/src/HelperChildConfig.cc b/src/HelperChildConfig.cc index 71c00442fe..ef6826b076 100644 --- a/src/HelperChildConfig.cc +++ b/src/HelperChildConfig.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "HelperChildConfig.h" #include "globals.h" diff --git a/src/HttpBody.cc b/src/HttpBody.cc index 110d282d56..caecd9e59f 100644 --- a/src/HttpBody.cc +++ b/src/HttpBody.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "HttpBody.h" #include "MemBuf.h" diff --git a/src/HttpHdrCc.cc b/src/HttpHdrCc.cc index 211402e652..4d86e7e461 100644 --- a/src/HttpHdrCc.cc +++ b/src/HttpHdrCc.cc @@ -30,7 +30,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "base/StringArea.h" #include "HttpHeader.h" #include "HttpHeaderStat.h" diff --git a/src/HttpHdrContRange.cc b/src/HttpHdrContRange.cc index c0af6ad673..85fdb4fe8f 100644 --- a/src/HttpHdrContRange.cc +++ b/src/HttpHdrContRange.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "HttpHdrContRange.h" /* diff --git a/src/HttpHdrRange.cc b/src/HttpHdrRange.cc index 401b46c136..f43b7f62f0 100644 --- a/src/HttpHdrRange.cc +++ b/src/HttpHdrRange.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "Store.h" #include "HttpHeaderRange.h" #include "client_side_request.h" diff --git a/src/HttpHdrSc.cc b/src/HttpHdrSc.cc index bf46d1ead8..1b554518bd 100644 --- a/src/HttpHdrSc.cc +++ b/src/HttpHdrSc.cc @@ -36,7 +36,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "Store.h" #include "HttpHeader.h" #include "HttpHeaderStat.h" diff --git a/src/HttpHdrScTarget.cc b/src/HttpHdrScTarget.cc index aac03689ac..cc9571ad6c 100644 --- a/src/HttpHdrScTarget.cc +++ b/src/HttpHdrScTarget.cc @@ -35,7 +35,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "HttpHdrSc.h" #include "StatHist.h" diff --git a/src/HttpHeader.cc b/src/HttpHeader.cc index e7e8da3d5a..cf398e7f23 100644 --- a/src/HttpHeader.cc +++ b/src/HttpHeader.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "base64.h" #include "HttpHdrContRange.h" #include "HttpHdrCc.h" diff --git a/src/HttpHeaderTools.cc b/src/HttpHeaderTools.cc index bdbd551a40..3e0ef255f7 100644 --- a/src/HttpHeaderTools.cc +++ b/src/HttpHeaderTools.cc @@ -32,7 +32,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "acl/FilledChecklist.h" #include "compat/strtoll.h" #include "HttpHdrContRange.h" diff --git a/src/HttpMsg.cc b/src/HttpMsg.cc index bd0e7a63d1..d18a75fee4 100644 --- a/src/HttpMsg.cc +++ b/src/HttpMsg.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "HttpMsg.h" #include "MemBuf.h" diff --git a/src/HttpParser.cc b/src/HttpParser.cc index 4f78ec8031..ce26868a39 100644 --- a/src/HttpParser.cc +++ b/src/HttpParser.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "Debug.h" #include "HttpParser.h" #include "structs.h" diff --git a/src/HttpReply.cc b/src/HttpReply.cc index 79d314430a..2168b4f499 100644 --- a/src/HttpReply.cc +++ b/src/HttpReply.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "SquidTime.h" #include "Store.h" #include "HttpBody.h" diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc index 91a0e3c43b..1bdbde357f 100644 --- a/src/HttpRequest.cc +++ b/src/HttpRequest.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "DnsLookupDetails.h" #include "HttpRequest.h" #include "HttpHdrCc.h" diff --git a/src/HttpRequestMethod.cc b/src/HttpRequestMethod.cc index d98f3a9f5c..b624e2fdee 100644 --- a/src/HttpRequestMethod.cc +++ b/src/HttpRequestMethod.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "HttpRequestMethod.h" #include "wordlist.h" diff --git a/src/HttpRequestMethod.h b/src/HttpRequestMethod.h index 873aabcc24..7a7d16de19 100644 --- a/src/HttpRequestMethod.h +++ b/src/HttpRequestMethod.h @@ -33,7 +33,7 @@ #ifndef SQUID_HTTPREQUESTMETHOD_H #define SQUID_HTTPREQUESTMETHOD_H -#include "squid.h" +#include "squid-old.h" #include #include "SquidString.h" diff --git a/src/HttpStatusLine.cc b/src/HttpStatusLine.cc index eda2844c81..5b36b08df5 100644 --- a/src/HttpStatusLine.cc +++ b/src/HttpStatusLine.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "HttpStatusLine.h" /* local constants */ diff --git a/src/LeakFinder.cc b/src/LeakFinder.cc index 3f6e1ed957..d66ff28247 100644 --- a/src/LeakFinder.cc +++ b/src/LeakFinder.cc @@ -36,7 +36,7 @@ * Use these to find memory leaks */ -#include "squid.h" +#include "squid-old.h" #include "LeakFinder.h" #include "Store.h" #include "SquidTime.h" diff --git a/src/LoadableModule.cc b/src/LoadableModule.cc index 996797efc3..3c62b41082 100644 --- a/src/LoadableModule.cc +++ b/src/LoadableModule.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" /* The original code has this constant ./configure-able. * The "#else" branches use raw dlopen interface and have not been tested. diff --git a/src/LoadableModules.cc b/src/LoadableModules.cc index e4dc3e1997..5dbb8f1bdf 100644 --- a/src/LoadableModules.cc +++ b/src/LoadableModules.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #include "wordlist.h" #include "LoadableModule.h" #include "LoadableModules.h" diff --git a/src/Makefile.am b/src/Makefile.am index fda261dec9..e90536c279 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -424,7 +424,7 @@ squid_SOURCES = \ send-announce.cc \ $(SBUF_SOURCE) \ $(SNMP_SOURCE) \ - squid.h \ + squid-old.h \ SquidMath.h \ SquidMath.cc \ SquidNew.cc \ @@ -691,7 +691,7 @@ ufsdump_SOURCES = \ tests/stub_HelperChildConfig.cc \ HttpRequestMethod.cc \ RemovalPolicy.cc \ - squid.h \ + squid-old.h \ $(WIN32_SOURCE) \ tests/stub_fd.cc ufsdump_LDADD = \ diff --git a/src/MemBlob.cc b/src/MemBlob.cc index 6316d02e7d..b50d3d4f0d 100644 --- a/src/MemBlob.cc +++ b/src/MemBlob.cc @@ -29,7 +29,7 @@ */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "Debug.h" #include "Mem.h" diff --git a/src/MemBuf.cc b/src/MemBuf.cc index 46c5ec1fc6..13ffdefd82 100644 --- a/src/MemBuf.cc +++ b/src/MemBuf.cc @@ -101,7 +101,7 @@ /* if you have configure you can use this */ #if defined(HAVE_CONFIG_H) -#include "config.h" +#include "squid.h" #endif #ifdef VA_COPY @@ -113,7 +113,7 @@ #define VA_COPY __va_copy #endif -#include "squid.h" +#include "squid-old.h" #include "MemBuf.h" /* local constants */ diff --git a/src/MemObject.cc b/src/MemObject.cc index 373a3db0c1..b35d26cae6 100644 --- a/src/MemObject.cc +++ b/src/MemObject.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "comm/Connection.h" #include "MemObject.h" #include "HttpRequest.h" diff --git a/src/MemStore.cc b/src/MemStore.cc index f3f31af3b3..a0b6300de6 100644 --- a/src/MemStore.cc +++ b/src/MemStore.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/RunnersRegistry.h" #include "ipc/mem/Page.h" #include "ipc/mem/Pages.h" diff --git a/src/NullDelayId.cc b/src/NullDelayId.cc index 87c22e688e..97580eaa8e 100644 --- a/src/NullDelayId.cc +++ b/src/NullDelayId.cc @@ -37,10 +37,10 @@ * Copyright (c) 2003, Robert Collins */ -#include "config.h" +#include "squid.h" #if USE_DELAY_POOLS -#include "squid.h" +#include "squid-old.h" #include "NullDelayId.h" #include "DelayPools.h" diff --git a/src/NullDelayId.h b/src/NullDelayId.h index 6efc3fae62..c66f3ce7e1 100644 --- a/src/NullDelayId.h +++ b/src/NullDelayId.h @@ -39,7 +39,7 @@ #ifndef NULLDELAYID_H #define NULLDELAYID_H #if USE_DELAY_POOLS -#include "squid.h" +#include "squid-old.h" #include "RefCount.h" #include "DelayIdComposite.h" diff --git a/src/Packer.cc b/src/Packer.cc index 4e50d1a5ad..a46e0c70d7 100644 --- a/src/Packer.cc +++ b/src/Packer.cc @@ -71,7 +71,7 @@ */ -#include "squid.h" +#include "squid-old.h" #include "Store.h" #include "MemBuf.h" diff --git a/src/Parsing.cc b/src/Parsing.cc index e0371fc145..0058ee77a8 100644 --- a/src/Parsing.cc +++ b/src/Parsing.cc @@ -32,7 +32,7 @@ * */ -#include "config.h" +#include "squid.h" #include "compat/strtoll.h" #include "Parsing.h" diff --git a/src/Parsing.h b/src/Parsing.h index 2b78a0ca75..259914d634 100644 --- a/src/Parsing.h +++ b/src/Parsing.h @@ -36,7 +36,7 @@ #ifndef SQUID_PARSING_H #define SQUID_PARSING_H -#include "squid.h" +#include "squid-old.h" extern double xatof(const char *token); extern int xatoi(const char *token); diff --git a/src/PeerDigest.h b/src/PeerDigest.h index 6eb7aeb524..696dc8f377 100644 --- a/src/PeerDigest.h +++ b/src/PeerDigest.h @@ -34,7 +34,7 @@ #ifndef SQUID_PEERDIGEST_H #define SQUID_PEERDIGEST_H -#include "squid.h" +#include "squid-old.h" #if USE_CACHE_DIGESTS diff --git a/src/ProfStats.cc b/src/ProfStats.cc index 6a311dcff0..ffea8a220e 100644 --- a/src/ProfStats.cc +++ b/src/ProfStats.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #if USE_XPROF_STATS diff --git a/src/ProtoPort.cc b/src/ProtoPort.cc index c24e340b0b..9fba353226 100644 --- a/src/ProtoPort.cc +++ b/src/ProtoPort.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "comm.h" #include "ProtoPort.h" #if HAVE_LIMITS diff --git a/src/RemovalPolicy.cc b/src/RemovalPolicy.cc index de8a58d5f1..437c9c3a10 100644 --- a/src/RemovalPolicy.cc +++ b/src/RemovalPolicy.cc @@ -33,7 +33,7 @@ * */ -#include "config.h" +#include "squid.h" #include "RemovalPolicy.h" CBDATA_CLASS_INIT(RemovalPolicy); diff --git a/src/RemovalPolicy.h b/src/RemovalPolicy.h index 276498b816..0b78ef0067 100644 --- a/src/RemovalPolicy.h +++ b/src/RemovalPolicy.h @@ -35,7 +35,7 @@ #ifndef SQUID_REMOVALPOLICY_H #define SQUID_REMOVALPOLICY_H -#include "squid.h" +#include "squid-old.h" #include "cbdata.h" class RemovalPolicyWalker; diff --git a/src/Server.cc b/src/Server.cc index 13e1d76adc..beffab6a46 100644 --- a/src/Server.cc +++ b/src/Server.cc @@ -32,7 +32,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "acl/Gadgets.h" #include "base/TextException.h" #include "comm/Connection.h" diff --git a/src/SquidConfig.cc b/src/SquidConfig.cc index 0dc94e2e11..24104e239b 100644 --- a/src/SquidConfig.cc +++ b/src/SquidConfig.cc @@ -2,7 +2,7 @@ * $Id$ */ -#include "config.h" +#include "squid.h" #include "ip/Address.h" // just for the global definition of Config and Config2 #include "structs.h" diff --git a/src/SquidMath.cc b/src/SquidMath.cc index b4160ba6d1..8a56d1bab5 100644 --- a/src/SquidMath.cc +++ b/src/SquidMath.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "SquidMath.h" int diff --git a/src/SquidNew.cc b/src/SquidNew.cc index 22aebfc71e..b742f89cda 100644 --- a/src/SquidNew.cc +++ b/src/SquidNew.cc @@ -35,7 +35,7 @@ #define _SQUID_EXTERNNEW_ -#include "squid.h" +#include "squid-old.h" #ifdef __SUNPRO_CC diff --git a/src/StatCounters.cc b/src/StatCounters.cc index 3091f520c8..34379fa250 100644 --- a/src/StatCounters.cc +++ b/src/StatCounters.cc @@ -29,7 +29,7 @@ * */ -#include "config.h" +#include "squid.h" #include "StatCounters.h" StatCounters statCounter; diff --git a/src/StatHist.cc b/src/StatHist.cc index f760577aed..9e5d0ddcc1 100644 --- a/src/StatHist.cc +++ b/src/StatHist.cc @@ -31,7 +31,7 @@ * */ -#include "config.h" +#include "squid.h" #include "StatHist.h" /* Local functions */ diff --git a/src/Store.h b/src/Store.h index 30d0a6b4de..38c51e2cc0 100644 --- a/src/Store.h +++ b/src/Store.h @@ -37,7 +37,7 @@ \ingroup FileSystems */ -#include "squid.h" +#include "squid-old.h" #include "StoreIOBuffer.h" #include "Range.h" #include "RefCount.h" diff --git a/src/StoreFileSystem.cc b/src/StoreFileSystem.cc index b76ba15b8f..13e06309cd 100644 --- a/src/StoreFileSystem.cc +++ b/src/StoreFileSystem.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "StoreFileSystem.h" Vector *StoreFileSystem::_FileSystems = NULL; diff --git a/src/StoreFileSystem.h b/src/StoreFileSystem.h index 586ef6113d..9ab38a5c19 100644 --- a/src/StoreFileSystem.h +++ b/src/StoreFileSystem.h @@ -33,7 +33,7 @@ #ifndef SQUID_STOREFILESYSTEM_H #define SQUID_STOREFILESYSTEM_H -#include "squid.h" +#include "squid-old.h" #include "Array.h" /* ****** DOCUMENTATION ***** */ diff --git a/src/StoreIOState.cc b/src/StoreIOState.cc index 9d7538ec28..0b18537e09 100644 --- a/src/StoreIOState.cc +++ b/src/StoreIOState.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "StoreIOState.h" void * diff --git a/src/StoreMeta.cc b/src/StoreMeta.cc index f784a8c209..bda8156207 100644 --- a/src/StoreMeta.cc +++ b/src/StoreMeta.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "StoreMeta.h" #include "Store.h" #include "MemObject.h" diff --git a/src/StoreMetaMD5.cc b/src/StoreMetaMD5.cc index 4d6bc43754..2325f1e9cf 100644 --- a/src/StoreMetaMD5.cc +++ b/src/StoreMetaMD5.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "StoreMetaMD5.h" #include "Store.h" #include "MemObject.h" diff --git a/src/StoreMetaSTD.cc b/src/StoreMetaSTD.cc index 236755b2c9..78033e835b 100644 --- a/src/StoreMetaSTD.cc +++ b/src/StoreMetaSTD.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "StoreMetaSTD.h" #include "Store.h" #include "MemObject.h" diff --git a/src/StoreMetaSTDLFS.cc b/src/StoreMetaSTDLFS.cc index da982ad7fc..58ff433557 100644 --- a/src/StoreMetaSTDLFS.cc +++ b/src/StoreMetaSTDLFS.cc @@ -32,7 +32,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "StoreMetaSTDLFS.h" #include "Store.h" #include "MemObject.h" diff --git a/src/StoreMetaURL.cc b/src/StoreMetaURL.cc index 65cc0cffd2..67278a3631 100644 --- a/src/StoreMetaURL.cc +++ b/src/StoreMetaURL.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "StoreMetaURL.h" #include "Store.h" #include "MemObject.h" diff --git a/src/StoreMetaUnpacker.cc b/src/StoreMetaUnpacker.cc index 855a4b4400..bd42702fe8 100644 --- a/src/StoreMetaUnpacker.cc +++ b/src/StoreMetaUnpacker.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "StoreMetaUnpacker.h" #include "StoreMeta.h" diff --git a/src/StoreMetaVary.cc b/src/StoreMetaVary.cc index 1563028e03..0c40c8a9d4 100644 --- a/src/StoreMetaVary.cc +++ b/src/StoreMetaVary.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "StoreMetaVary.h" #include "Store.h" #include "MemObject.h" diff --git a/src/StoreSearch.h b/src/StoreSearch.h index 2361a602a0..ed0af92db7 100644 --- a/src/StoreSearch.h +++ b/src/StoreSearch.h @@ -33,7 +33,7 @@ #ifndef SQUID_STORESEARCH_H #define SQUID_STORESEARCH_H -#include "squid.h" +#include "squid-old.h" #include "RefCount.h" #include "Store.h" diff --git a/src/StoreStats.cc b/src/StoreStats.cc index 6541542b19..ac950e1fc2 100644 --- a/src/StoreStats.cc +++ b/src/StoreStats.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "protos.h" /* for xmemset only */ #include "StoreStats.h" diff --git a/src/StoreSwapLogData.cc b/src/StoreSwapLogData.cc index 24ae521120..fb1e50fb17 100644 --- a/src/StoreSwapLogData.cc +++ b/src/StoreSwapLogData.cc @@ -32,7 +32,7 @@ * */ -#include "config.h" +#include "squid.h" #include "StoreSwapLogData.h" #include "swap_log_op.h" diff --git a/src/StoreSwapLogData.h b/src/StoreSwapLogData.h index 5fad46944f..abbfb766d8 100644 --- a/src/StoreSwapLogData.h +++ b/src/StoreSwapLogData.h @@ -59,7 +59,7 @@ * the value for MemObject->swap_hdr_sz. */ -#include "squid.h" +#include "squid-old.h" /* * Do we need to have the dirn in here? I don't think so, since we already diff --git a/src/String.cc b/src/String.cc index e295d521ef..a1b2604a6f 100644 --- a/src/String.cc +++ b/src/String.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "base/TextException.h" #include "mgr/Registration.h" #include "Store.h" diff --git a/src/SwapDir.cc b/src/SwapDir.cc index 33b5a4dada..43af800a0c 100644 --- a/src/SwapDir.cc +++ b/src/SwapDir.cc @@ -32,7 +32,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "compat/strtoll.h" #include "SwapDir.h" #include "StoreFileSystem.h" diff --git a/src/URLScheme.cc b/src/URLScheme.cc index 66aef0225e..b79de5f7f1 100644 --- a/src/URLScheme.cc +++ b/src/URLScheme.cc @@ -33,7 +33,7 @@ * */ -#include "config.h" +#include "squid.h" #include "URLScheme.h" #include "wordlist.h" diff --git a/src/WinSvc.cc b/src/WinSvc.cc index 2b8b7eaf34..5cfcbb6219 100644 --- a/src/WinSvc.cc +++ b/src/WinSvc.cc @@ -34,7 +34,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "squid_windows.h" #if _SQUID_MSWIN_ diff --git a/src/acl/Acl.cc b/src/acl/Acl.cc index 39ba89ba1e..cb8e923a70 100644 --- a/src/acl/Acl.cc +++ b/src/acl/Acl.cc @@ -31,7 +31,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * */ -#include "config.h" +#include "squid.h" #include "acl/Acl.h" #include "acl/Checklist.h" #include "ConfigParser.h" diff --git a/src/acl/Arp.cc b/src/acl/Arp.cc index 81e2abaf00..bccbca1637 100644 --- a/src/acl/Arp.cc +++ b/src/acl/Arp.cc @@ -32,7 +32,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #if USE_SQUID_EUI diff --git a/src/acl/Asn.cc b/src/acl/Asn.cc index 05c5640a97..bf54622dbe 100644 --- a/src/acl/Asn.cc +++ b/src/acl/Asn.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "mgr/Registration.h" #include "radix.h" #include "HttpRequest.h" diff --git a/src/acl/Browser.cc b/src/acl/Browser.cc index 02fa8dcbab..31ebdded92 100644 --- a/src/acl/Browser.cc +++ b/src/acl/Browser.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "acl/Checklist.h" #include "acl/Browser.h" #include "acl/RegexData.h" diff --git a/src/acl/Certificate.cc b/src/acl/Certificate.cc index 32c51f1409..76f362c498 100644 --- a/src/acl/Certificate.cc +++ b/src/acl/Certificate.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" /* MS Visual Studio Projects are monolithic, so we need the following * #if to exclude the SSL code from compile process when not needed. diff --git a/src/acl/CertificateData.cc b/src/acl/CertificateData.cc index 9921732d6d..cb6a5f25d4 100644 --- a/src/acl/CertificateData.cc +++ b/src/acl/CertificateData.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "acl/CertificateData.h" #include "acl/Checklist.h" #include "wordlist.h" diff --git a/src/acl/Checklist.cc b/src/acl/Checklist.cc index 449f383422..496dbf9228 100644 --- a/src/acl/Checklist.cc +++ b/src/acl/Checklist.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "acl/Checklist.h" allow_t const & diff --git a/src/acl/DestinationDomain.cc b/src/acl/DestinationDomain.cc index c5836db5aa..55c267b41a 100644 --- a/src/acl/DestinationDomain.cc +++ b/src/acl/DestinationDomain.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "acl/DestinationDomain.h" #include "acl/Checklist.h" #include "acl/RegexData.h" diff --git a/src/acl/DestinationIp.cc b/src/acl/DestinationIp.cc index 0de76f0537..3255650678 100644 --- a/src/acl/DestinationIp.cc +++ b/src/acl/DestinationIp.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "acl/DestinationIp.h" #include "acl/FilledChecklist.h" #include "comm/Connection.h" diff --git a/src/acl/DomainData.cc b/src/acl/DomainData.cc index 411bc44079..b435e5a944 100644 --- a/src/acl/DomainData.cc +++ b/src/acl/DomainData.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "acl/DomainData.h" #include "acl/Checklist.h" #include "wordlist.h" diff --git a/src/acl/Eui64.cc b/src/acl/Eui64.cc index cd86c4cb21..26c56affb4 100644 --- a/src/acl/Eui64.cc +++ b/src/acl/Eui64.cc @@ -32,7 +32,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #if USE_SQUID_EUI diff --git a/src/acl/ExtUser.cc b/src/acl/ExtUser.cc index a13aab7243..72e4111db3 100644 --- a/src/acl/ExtUser.cc +++ b/src/acl/ExtUser.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #if USE_AUTH diff --git a/src/acl/FilledChecklist.cc b/src/acl/FilledChecklist.cc index 186cb8ab69..16d6f27660 100644 --- a/src/acl/FilledChecklist.cc +++ b/src/acl/FilledChecklist.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #include "HttpRequest.h" #include "HttpReply.h" #include "client_side.h" diff --git a/src/acl/Gadgets.cc b/src/acl/Gadgets.cc index ec11433f5d..90c5eec138 100644 --- a/src/acl/Gadgets.cc +++ b/src/acl/Gadgets.cc @@ -38,7 +38,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "acl/Acl.h" #include "acl/Checklist.h" #include "acl/Strategised.h" diff --git a/src/acl/HierCode.cc b/src/acl/HierCode.cc index 70bf4f41ab..c44f60391e 100644 --- a/src/acl/HierCode.cc +++ b/src/acl/HierCode.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #include "acl/HierCode.h" #include "acl/HierCodeData.h" #include "acl/Checklist.h" diff --git a/src/acl/HierCodeData.cc b/src/acl/HierCodeData.cc index 3e5e17cdea..7345bc417d 100644 --- a/src/acl/HierCodeData.cc +++ b/src/acl/HierCodeData.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #include "acl/HierCodeData.h" #include "acl/Checklist.h" #include "hier_code.h" diff --git a/src/acl/HttpHeaderData.cc b/src/acl/HttpHeaderData.cc index e7d5f3df44..9db21b5762 100644 --- a/src/acl/HttpHeaderData.cc +++ b/src/acl/HttpHeaderData.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "acl/HttpHeaderData.h" #include "acl/Checklist.h" #include "acl/Acl.h" diff --git a/src/acl/HttpRepHeader.cc b/src/acl/HttpRepHeader.cc index 89ca1ecb05..6fba27437b 100644 --- a/src/acl/HttpRepHeader.cc +++ b/src/acl/HttpRepHeader.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "acl/HttpRepHeader.h" #include "acl/HttpHeaderData.h" #include "acl/Checklist.h" diff --git a/src/acl/HttpReqHeader.cc b/src/acl/HttpReqHeader.cc index 169d338356..d9d2259030 100644 --- a/src/acl/HttpReqHeader.cc +++ b/src/acl/HttpReqHeader.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "acl/HttpReqHeader.h" #include "acl/HttpHeaderData.h" #include "acl/Checklist.h" diff --git a/src/acl/HttpStatus.cc b/src/acl/HttpStatus.cc index 2514a8cb3f..0d4cee4c86 100644 --- a/src/acl/HttpStatus.cc +++ b/src/acl/HttpStatus.cc @@ -34,11 +34,11 @@ * Copyright (c) 2003, Robert Collins */ -#include "config.h" +#include "squid.h" #if _SQUID_CYGWIN_ #include #endif -#include "squid.h" +#include "squid-old.h" #include "acl/HttpStatus.h" #include "acl/FilledChecklist.h" diff --git a/src/acl/IntRange.cc b/src/acl/IntRange.cc index a8fdf0d729..a985fc70f0 100644 --- a/src/acl/IntRange.cc +++ b/src/acl/IntRange.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "acl/IntRange.h" #include "wordlist.h" #include "Parsing.h" diff --git a/src/acl/Ip.cc b/src/acl/Ip.cc index a1e2ffd811..b1c05c360c 100644 --- a/src/acl/Ip.cc +++ b/src/acl/Ip.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" //#include "compat/getaddrinfo.h" #include "acl/Ip.h" #include "acl/Checklist.h" diff --git a/src/acl/LocalIp.cc b/src/acl/LocalIp.cc index ab04b796ee..b5ffb359e2 100644 --- a/src/acl/LocalIp.cc +++ b/src/acl/LocalIp.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "acl/LocalIp.h" #include "acl/FilledChecklist.h" diff --git a/src/acl/LocalPort.cc b/src/acl/LocalPort.cc index bf640cd9e0..33139670fc 100644 --- a/src/acl/LocalPort.cc +++ b/src/acl/LocalPort.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "acl/LocalPort.h" #include "acl/IntRange.h" #include "acl/Checklist.h" diff --git a/src/acl/MaxConnection.cc b/src/acl/MaxConnection.cc index c7cafe4fd6..81a848aca0 100644 --- a/src/acl/MaxConnection.cc +++ b/src/acl/MaxConnection.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "acl/FilledChecklist.h" #include "acl/MaxConnection.h" #include "wordlist.h" diff --git a/src/acl/Method.cc b/src/acl/Method.cc index 5039967ee4..25574a2726 100644 --- a/src/acl/Method.cc +++ b/src/acl/Method.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "acl/Method.h" #include "acl/MethodData.h" #include "acl/Checklist.h" diff --git a/src/acl/MethodData.cc b/src/acl/MethodData.cc index a5347442a5..8d43522795 100644 --- a/src/acl/MethodData.cc +++ b/src/acl/MethodData.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "acl/MethodData.h" #include "acl/Checklist.h" #include "HttpRequestMethod.h" diff --git a/src/acl/MyPortName.cc b/src/acl/MyPortName.cc index 75d384473a..7eeb7f081a 100644 --- a/src/acl/MyPortName.cc +++ b/src/acl/MyPortName.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "ProtoPort.h" #include "acl/MyPortName.h" #include "acl/StringData.h" diff --git a/src/acl/PeerName.cc b/src/acl/PeerName.cc index 55bd41ccec..91f496229c 100644 --- a/src/acl/PeerName.cc +++ b/src/acl/PeerName.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #include "acl/PeerName.h" #include "acl/StringData.h" #include "acl/Checklist.h" diff --git a/src/acl/Protocol.cc b/src/acl/Protocol.cc index 6d0a4e0a6e..76646cfb90 100644 --- a/src/acl/Protocol.cc +++ b/src/acl/Protocol.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "acl/Protocol.h" #include "acl/ProtocolData.h" #include "acl/Checklist.h" diff --git a/src/acl/ProtocolData.cc b/src/acl/ProtocolData.cc index 7aba10769c..8f6838a7a5 100644 --- a/src/acl/ProtocolData.cc +++ b/src/acl/ProtocolData.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "acl/ProtocolData.h" #include "acl/Checklist.h" #include "URLScheme.h" diff --git a/src/acl/Random.cc b/src/acl/Random.cc index b43e0790c1..20ac84cffd 100644 --- a/src/acl/Random.cc +++ b/src/acl/Random.cc @@ -32,7 +32,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "acl/FilledChecklist.h" #include "acl/Random.h" diff --git a/src/acl/Referer.cc b/src/acl/Referer.cc index 415903aa6a..adf1876513 100644 --- a/src/acl/Referer.cc +++ b/src/acl/Referer.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "acl/Referer.h" #include "acl/Checklist.h" #include "acl/RegexData.h" diff --git a/src/acl/RegexData.cc b/src/acl/RegexData.cc index 1ae1eb437a..2138e46c4d 100644 --- a/src/acl/RegexData.cc +++ b/src/acl/RegexData.cc @@ -36,7 +36,7 @@ * Copyright (c) 2011, Marcus Kool */ -#include "squid.h" +#include "squid-old.h" #include "acl/RegexData.h" #include "acl/Checklist.h" #include "acl/Acl.h" diff --git a/src/acl/ReplyMimeType.cc b/src/acl/ReplyMimeType.cc index 265be3efeb..13a5c7957d 100644 --- a/src/acl/ReplyMimeType.cc +++ b/src/acl/ReplyMimeType.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "acl/ReplyMimeType.h" #include "acl/Checklist.h" #include "acl/RegexData.h" diff --git a/src/acl/RequestMimeType.cc b/src/acl/RequestMimeType.cc index d7f96dd3f3..153796250c 100644 --- a/src/acl/RequestMimeType.cc +++ b/src/acl/RequestMimeType.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "acl/RequestMimeType.h" #include "acl/Checklist.h" #include "acl/RegexData.h" diff --git a/src/acl/SourceDomain.cc b/src/acl/SourceDomain.cc index 322c4f7efc..ace22a3a42 100644 --- a/src/acl/SourceDomain.cc +++ b/src/acl/SourceDomain.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "acl/SourceDomain.h" #include "acl/Checklist.h" #include "acl/RegexData.h" diff --git a/src/acl/SourceIp.cc b/src/acl/SourceIp.cc index 654dbade07..834ab28285 100644 --- a/src/acl/SourceIp.cc +++ b/src/acl/SourceIp.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "acl/SourceIp.h" #include "acl/FilledChecklist.h" diff --git a/src/acl/SslError.cc b/src/acl/SslError.cc index 33041e6d17..c729a1f424 100644 --- a/src/acl/SslError.cc +++ b/src/acl/SslError.cc @@ -3,7 +3,7 @@ * $Id$ */ -#include "squid.h" +#include "squid-old.h" #include "acl/SslError.h" #include "acl/SslErrorData.h" #include "acl/Checklist.h" diff --git a/src/acl/SslErrorData.cc b/src/acl/SslErrorData.cc index 820ed646af..da4e3398ad 100644 --- a/src/acl/SslErrorData.cc +++ b/src/acl/SslErrorData.cc @@ -2,7 +2,7 @@ * $Id$ */ -#include "squid.h" +#include "squid-old.h" #include "acl/SslErrorData.h" #include "acl/Checklist.h" #include "wordlist.h" diff --git a/src/acl/Strategised.cc b/src/acl/Strategised.cc index 278d8f2ec5..bca4792b76 100644 --- a/src/acl/Strategised.cc +++ b/src/acl/Strategised.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "acl/Strategised.h" /* diff --git a/src/acl/StringData.cc b/src/acl/StringData.cc index fa9265037b..ea71c016ac 100644 --- a/src/acl/StringData.cc +++ b/src/acl/StringData.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "acl/StringData.h" #include "acl/Checklist.h" #include "wordlist.h" diff --git a/src/acl/Tag.cc b/src/acl/Tag.cc index ef4ac00695..79e919e5b8 100644 --- a/src/acl/Tag.cc +++ b/src/acl/Tag.cc @@ -34,7 +34,7 @@ * Copyright (c) 2009, Henrik Nordstrom */ -#include "squid.h" +#include "squid-old.h" #include "acl/Tag.h" #include "acl/StringData.h" #include "acl/Checklist.h" diff --git a/src/acl/Time.cc b/src/acl/Time.cc index d4007ec071..7a871dbe03 100644 --- a/src/acl/Time.cc +++ b/src/acl/Time.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "acl/Time.h" #include "acl/TimeData.h" #include "SquidTime.h" diff --git a/src/acl/TimeData.cc b/src/acl/TimeData.cc index f90a269d13..78771ccd71 100644 --- a/src/acl/TimeData.cc +++ b/src/acl/TimeData.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "acl/TimeData.h" #include "acl/Checklist.h" #include "wordlist.h" diff --git a/src/acl/Url.cc b/src/acl/Url.cc index a7366b6a55..53bba00c93 100644 --- a/src/acl/Url.cc +++ b/src/acl/Url.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "acl/Url.h" #include "acl/Checklist.h" #include "acl/RegexData.h" diff --git a/src/acl/UrlPath.cc b/src/acl/UrlPath.cc index cd1a8bae52..792a7015a0 100644 --- a/src/acl/UrlPath.cc +++ b/src/acl/UrlPath.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "acl/UrlPath.h" #include "acl/Checklist.h" #include "acl/RegexData.h" diff --git a/src/acl/UrlPort.cc b/src/acl/UrlPort.cc index e575c563f8..9078da23f6 100644 --- a/src/acl/UrlPort.cc +++ b/src/acl/UrlPort.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "acl/UrlPort.h" #include "acl/IntRange.h" #include "acl/Checklist.h" diff --git a/src/acl/UserData.cc b/src/acl/UserData.cc index 80df73e35f..4e1e732f0f 100644 --- a/src/acl/UserData.cc +++ b/src/acl/UserData.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "acl/UserData.h" #include "acl/Checklist.h" #include "wordlist.h" diff --git a/src/adaptation/AccessCheck.cc b/src/adaptation/AccessCheck.cc index a8b9c2bcbb..9a8ead819d 100644 --- a/src/adaptation/AccessCheck.cc +++ b/src/adaptation/AccessCheck.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #include "structs.h" #include "ConfigParser.h" diff --git a/src/adaptation/AccessRule.cc b/src/adaptation/AccessRule.cc index 2aa3c97ed6..1a5b3bd403 100644 --- a/src/adaptation/AccessRule.cc +++ b/src/adaptation/AccessRule.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #include "structs.h" #include "ConfigParser.h" diff --git a/src/adaptation/Answer.cc b/src/adaptation/Answer.cc index dc3daaccdf..cf80ada19d 100644 --- a/src/adaptation/Answer.cc +++ b/src/adaptation/Answer.cc @@ -2,7 +2,7 @@ * DEBUG: section 93 ICAP (RFC 3507) Client */ -#include "config.h" +#include "squid.h" #include "adaptation/Answer.h" #include "base/AsyncJobCalls.h" diff --git a/src/adaptation/Config.cc b/src/adaptation/Config.cc index 7ce5813a05..17a1d79ef9 100644 --- a/src/adaptation/Config.cc +++ b/src/adaptation/Config.cc @@ -30,7 +30,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "structs.h" #include "ConfigParser.h" diff --git a/src/adaptation/DynamicGroupCfg.cc b/src/adaptation/DynamicGroupCfg.cc index 9bcba5c0b3..f5ebf4a3d7 100644 --- a/src/adaptation/DynamicGroupCfg.cc +++ b/src/adaptation/DynamicGroupCfg.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "adaptation/DynamicGroupCfg.h" diff --git a/src/adaptation/Elements.cc b/src/adaptation/Elements.cc index 613ea0ed08..8d55a4f36e 100644 --- a/src/adaptation/Elements.cc +++ b/src/adaptation/Elements.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #include "adaptation/Elements.h" const char *Adaptation::crlf = "\r\n"; diff --git a/src/adaptation/History.cc b/src/adaptation/History.cc index 97ea84bf5b..ab58961b3e 100644 --- a/src/adaptation/History.cc +++ b/src/adaptation/History.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "adaptation/Config.h" #include "adaptation/History.h" #include "base/TextException.h" diff --git a/src/adaptation/Initiate.cc b/src/adaptation/Initiate.cc index c40dd5bfb9..38d29f0bab 100644 --- a/src/adaptation/Initiate.cc +++ b/src/adaptation/Initiate.cc @@ -2,7 +2,7 @@ * DEBUG: section 93 ICAP (RFC 3507) Client */ -#include "squid.h" +#include "squid-old.h" #include "HttpMsg.h" #include "adaptation/Answer.h" #include "adaptation/Initiator.h" diff --git a/src/adaptation/Initiator.cc b/src/adaptation/Initiator.cc index 511e3437df..af6c481b0e 100644 --- a/src/adaptation/Initiator.cc +++ b/src/adaptation/Initiator.cc @@ -2,7 +2,7 @@ * DEBUG: section 93 ICAP (RFC 3507) Client */ -#include "squid.h" +#include "squid-old.h" #include "adaptation/Initiate.h" #include "adaptation/Initiator.h" #include "base/AsyncJobCalls.h" diff --git a/src/adaptation/Iterator.cc b/src/adaptation/Iterator.cc index 74b713dfc6..47dfa34bb1 100644 --- a/src/adaptation/Iterator.cc +++ b/src/adaptation/Iterator.cc @@ -2,7 +2,7 @@ * DEBUG: section 93 Adaptation */ -#include "squid.h" +#include "squid-old.h" #include "adaptation/Answer.h" #include "adaptation/Config.h" #include "adaptation/Iterator.h" diff --git a/src/adaptation/Message.cc b/src/adaptation/Message.cc index dd5ce3867f..334a0f318b 100644 --- a/src/adaptation/Message.cc +++ b/src/adaptation/Message.cc @@ -2,7 +2,7 @@ * DEBUG: section 93 Adaptation */ -#include "squid.h" +#include "squid-old.h" #include "adaptation/Message.h" #include "base/TextException.h" #include "HttpMsg.h" diff --git a/src/adaptation/Service.cc b/src/adaptation/Service.cc index dd297d8a91..49a742598f 100644 --- a/src/adaptation/Service.cc +++ b/src/adaptation/Service.cc @@ -2,7 +2,7 @@ * DEBUG: section 93 Adaptation */ -#include "squid.h" +#include "squid-old.h" #include "HttpRequest.h" #include "adaptation/ServiceFilter.h" #include "adaptation/Service.h" diff --git a/src/adaptation/ServiceConfig.cc b/src/adaptation/ServiceConfig.cc index b064336685..ecffe2e19a 100644 --- a/src/adaptation/ServiceConfig.cc +++ b/src/adaptation/ServiceConfig.cc @@ -2,7 +2,7 @@ * DEBUG: section 93 Adaptation */ -#include "squid.h" +#include "squid-old.h" #include "ConfigParser.h" #include "adaptation/ServiceConfig.h" #include "ip/tools.h" diff --git a/src/adaptation/ServiceFilter.cc b/src/adaptation/ServiceFilter.cc index eb3965b89c..095cd2a383 100644 --- a/src/adaptation/ServiceFilter.cc +++ b/src/adaptation/ServiceFilter.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #include "HttpRequest.h" #include "HttpReply.h" #include "adaptation/ServiceFilter.h" diff --git a/src/adaptation/ServiceGroups.cc b/src/adaptation/ServiceGroups.cc index def467770f..81eeb5d8f2 100644 --- a/src/adaptation/ServiceGroups.cc +++ b/src/adaptation/ServiceGroups.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #include "ConfigParser.h" #include "adaptation/Config.h" diff --git a/src/adaptation/ecap/Config.cc b/src/adaptation/ecap/Config.cc index e6cd269cae..98ed01acb4 100644 --- a/src/adaptation/ecap/Config.cc +++ b/src/adaptation/ecap/Config.cc @@ -2,7 +2,7 @@ * $Id$ * DEBUG: section 93 eCAP Interface */ -#include "squid.h" +#include "squid-old.h" #include "adaptation/ecap/Host.h" #include "adaptation/ecap/ServiceRep.h" diff --git a/src/adaptation/ecap/Host.cc b/src/adaptation/ecap/Host.cc index 629ae1d230..3328910511 100644 --- a/src/adaptation/ecap/Host.cc +++ b/src/adaptation/ecap/Host.cc @@ -1,7 +1,7 @@ /* * DEBUG: section 93 eCAP Interface */ -#include "squid.h" +#include "squid-old.h" #include #include #include diff --git a/src/adaptation/ecap/MessageRep.cc b/src/adaptation/ecap/MessageRep.cc index b5fea11d4e..12fb703efa 100644 --- a/src/adaptation/ecap/MessageRep.cc +++ b/src/adaptation/ecap/MessageRep.cc @@ -1,7 +1,7 @@ /* * DEBUG: section 93 eCAP Interface */ -#include "squid.h" +#include "squid-old.h" #include "HttpRequest.h" #include "HttpReply.h" #include "BodyPipe.h" diff --git a/src/adaptation/ecap/MinimalAdapter.cc b/src/adaptation/ecap/MinimalAdapter.cc index d49952675b..a63bd70a7a 100644 --- a/src/adaptation/ecap/MinimalAdapter.cc +++ b/src/adaptation/ecap/MinimalAdapter.cc @@ -1,2 +1,2 @@ -#include "config.h" +#include "squid.h" // TBD diff --git a/src/adaptation/ecap/ServiceRep.cc b/src/adaptation/ecap/ServiceRep.cc index 2a8fa88bde..2f20f83e80 100644 --- a/src/adaptation/ecap/ServiceRep.cc +++ b/src/adaptation/ecap/ServiceRep.cc @@ -1,7 +1,7 @@ /* * DEBUG: section 93 eCAP Interface */ -#include "squid.h" +#include "squid-old.h" #include #include #include diff --git a/src/adaptation/ecap/XactionRep.cc b/src/adaptation/ecap/XactionRep.cc index 656bda8b00..3c6c875260 100644 --- a/src/adaptation/ecap/XactionRep.cc +++ b/src/adaptation/ecap/XactionRep.cc @@ -1,7 +1,7 @@ /* * DEBUG: section 93 eCAP Interface */ -#include "squid.h" +#include "squid-old.h" #include #include #include diff --git a/src/adaptation/icap/Client.cc b/src/adaptation/icap/Client.cc index 3825d51a10..c8b8fd1fd1 100644 --- a/src/adaptation/icap/Client.cc +++ b/src/adaptation/icap/Client.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #include "adaptation/icap/Client.h" void Adaptation::Icap::InitModule() diff --git a/src/adaptation/icap/Config.cc b/src/adaptation/icap/Config.cc index 7927435463..47da4f1e6b 100644 --- a/src/adaptation/icap/Config.cc +++ b/src/adaptation/icap/Config.cc @@ -32,7 +32,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "ConfigParser.h" #include "Store.h" diff --git a/src/adaptation/icap/Elements.cc b/src/adaptation/icap/Elements.cc index ac82c70ad4..26de7d8db8 100644 --- a/src/adaptation/icap/Elements.cc +++ b/src/adaptation/icap/Elements.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #include "adaptation/icap/Elements.h" // TODO: remove this file? diff --git a/src/adaptation/icap/History.cc b/src/adaptation/icap/History.cc index dbc2666492..4e1d5affae 100644 --- a/src/adaptation/icap/History.cc +++ b/src/adaptation/icap/History.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #include "adaptation/icap/History.h" #include "globals.h" #include "SquidTime.h" diff --git a/src/adaptation/icap/Launcher.cc b/src/adaptation/icap/Launcher.cc index bf5482ddcf..bfb92f5877 100644 --- a/src/adaptation/icap/Launcher.cc +++ b/src/adaptation/icap/Launcher.cc @@ -2,7 +2,7 @@ * DEBUG: section 93 ICAP (RFC 3507) Client */ -#include "squid.h" +#include "squid-old.h" #include "acl/FilledChecklist.h" #include "adaptation/Answer.h" #include "adaptation/icap/Launcher.h" diff --git a/src/adaptation/icap/ModXact.cc b/src/adaptation/icap/ModXact.cc index 0451714b0f..89f16d4401 100644 --- a/src/adaptation/icap/ModXact.cc +++ b/src/adaptation/icap/ModXact.cc @@ -2,7 +2,7 @@ * DEBUG: section 93 ICAP (RFC 3507) Client */ -#include "squid.h" +#include "squid-old.h" #include "AccessLogEntry.h" #include "adaptation/Answer.h" #include "adaptation/History.h" diff --git a/src/adaptation/icap/OptXact.cc b/src/adaptation/icap/OptXact.cc index 174feeb0c4..9ae9d3e70c 100644 --- a/src/adaptation/icap/OptXact.cc +++ b/src/adaptation/icap/OptXact.cc @@ -2,7 +2,7 @@ * DEBUG: section 93 ICAP (RFC 3507) Client */ -#include "squid.h" +#include "squid-old.h" #include "comm.h" #include "HttpReply.h" diff --git a/src/adaptation/icap/Options.cc b/src/adaptation/icap/Options.cc index 6a626e84ff..f216658027 100644 --- a/src/adaptation/icap/Options.cc +++ b/src/adaptation/icap/Options.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #include "adaptation/icap/Config.h" #include "adaptation/icap/Options.h" #include "base/TextException.h" diff --git a/src/adaptation/icap/Options.h b/src/adaptation/icap/Options.h index aeb8621a5d..22d93d183a 100644 --- a/src/adaptation/icap/Options.h +++ b/src/adaptation/icap/Options.h @@ -34,7 +34,7 @@ #ifndef SQUID_ICAPOPTIONS_H #define SQUID_ICAPOPTIONS_H -#include "squid.h" +#include "squid-old.h" #include "adaptation/icap/ServiceRep.h" class wordlist; diff --git a/src/adaptation/icap/ServiceRep.cc b/src/adaptation/icap/ServiceRep.cc index d4028c18e5..25823921dc 100644 --- a/src/adaptation/icap/ServiceRep.cc +++ b/src/adaptation/icap/ServiceRep.cc @@ -2,7 +2,7 @@ * DEBUG: section 93 ICAP (RFC 3507) Client */ -#include "squid.h" +#include "squid-old.h" #include "adaptation/Answer.h" #include "adaptation/icap/Config.h" #include "adaptation/icap/ModXact.h" diff --git a/src/adaptation/icap/Xaction.cc b/src/adaptation/icap/Xaction.cc index 6148426ae6..1fa5d57ab5 100644 --- a/src/adaptation/icap/Xaction.cc +++ b/src/adaptation/icap/Xaction.cc @@ -2,7 +2,7 @@ * DEBUG: section 93 ICAP (RFC 3507) Client */ -#include "squid.h" +#include "squid-old.h" #include "comm.h" #include "comm/Connection.h" #include "comm/ConnOpener.h" diff --git a/src/adaptation/icap/icap_log.cc b/src/adaptation/icap/icap_log.cc index 8aee8e7cc5..db21709491 100644 --- a/src/adaptation/icap/icap_log.cc +++ b/src/adaptation/icap/icap_log.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #include "icap_log.h" #include "AccessLogEntry.h" #include "log/File.h" diff --git a/src/auth/Acl.cc b/src/auth/Acl.cc index 3ff0cf9ff3..6537b225b4 100644 --- a/src/auth/Acl.cc +++ b/src/auth/Acl.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #include "acl/Acl.h" #include "acl/FilledChecklist.h" #include "auth/UserRequest.h" diff --git a/src/auth/AclMaxUserIp.cc b/src/auth/AclMaxUserIp.cc index d59a454da7..1aa9155357 100644 --- a/src/auth/AclMaxUserIp.cc +++ b/src/auth/AclMaxUserIp.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "acl/FilledChecklist.h" #include "auth/Acl.h" #include "auth/AclMaxUserIp.h" diff --git a/src/auth/AclProxyAuth.cc b/src/auth/AclProxyAuth.cc index d844f1a489..085e6c4e9c 100644 --- a/src/auth/AclProxyAuth.cc +++ b/src/auth/AclProxyAuth.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "auth/AclProxyAuth.h" #include "auth/Gadgets.h" #include "acl/FilledChecklist.h" diff --git a/src/auth/Config.cc b/src/auth/Config.cc index bf6fec998c..7fdeba7172 100644 --- a/src/auth/Config.cc +++ b/src/auth/Config.cc @@ -32,7 +32,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "auth/Config.h" #include "auth/UserRequest.h" diff --git a/src/auth/Gadgets.cc b/src/auth/Gadgets.cc index 1a310612e2..e5b0acc8a4 100644 --- a/src/auth/Gadgets.cc +++ b/src/auth/Gadgets.cc @@ -36,7 +36,7 @@ * They DO NOT perform access control or auditing. * See acl.c for access control and client_side.c for auditing */ -#include "squid.h" +#include "squid-old.h" #include "acl/Acl.h" #include "acl/FilledChecklist.h" #include "client_side.h" diff --git a/src/auth/Scheme.cc b/src/auth/Scheme.cc index 414551eab4..e63f6d3060 100644 --- a/src/auth/Scheme.cc +++ b/src/auth/Scheme.cc @@ -33,7 +33,7 @@ * Copyright (c) 2004, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "auth/Scheme.h" #include "auth/Gadgets.h" #include "auth/Config.h" diff --git a/src/auth/State.cc b/src/auth/State.cc index 78cb4bff99..187a83c543 100644 --- a/src/auth/State.cc +++ b/src/auth/State.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #if USE_AUTH #include "auth/State.h" diff --git a/src/auth/User.cc b/src/auth/User.cc index efb764c506..a86a866f1f 100644 --- a/src/auth/User.cc +++ b/src/auth/User.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "auth/User.h" #include "auth/UserRequest.h" #include "auth/Config.h" diff --git a/src/auth/UserRequest.cc b/src/auth/UserRequest.cc index f6f44f4e9b..7ba7ebaf5d 100644 --- a/src/auth/UserRequest.cc +++ b/src/auth/UserRequest.cc @@ -39,7 +39,7 @@ * They DO NOT perform access control or auditing. * See acl.c for access control and client_side.c for auditing */ -#include "squid.h" +#include "squid-old.h" #include "auth/Config.h" #include "auth/Scheme.h" #include "auth/UserRequest.h" diff --git a/src/auth/basic/Scheme.cc b/src/auth/basic/Scheme.cc index 0dd718ac4d..2628b02492 100644 --- a/src/auth/basic/Scheme.cc +++ b/src/auth/basic/Scheme.cc @@ -30,7 +30,7 @@ * */ -#include "config.h" +#include "squid.h" #include "auth/basic/Scheme.h" #include "helper.h" diff --git a/src/auth/basic/User.cc b/src/auth/basic/User.cc index 1f08b04ede..bcd1841839 100644 --- a/src/auth/basic/User.cc +++ b/src/auth/basic/User.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "auth/basic/auth_basic.h" #include "auth/basic/User.h" #include "Debug.h" diff --git a/src/auth/basic/UserRequest.cc b/src/auth/basic/UserRequest.cc index 99a65caa80..0efa5adb5c 100644 --- a/src/auth/basic/UserRequest.cc +++ b/src/auth/basic/UserRequest.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "auth/basic/auth_basic.h" #include "auth/basic/User.h" #include "auth/basic/UserRequest.h" diff --git a/src/auth/basic/auth_basic.cc b/src/auth/basic/auth_basic.cc index e6dc3e0740..00531121ec 100644 --- a/src/auth/basic/auth_basic.cc +++ b/src/auth/basic/auth_basic.cc @@ -37,7 +37,7 @@ * See acl.c for access control and client_side.c for auditing */ -#include "squid.h" +#include "squid-old.h" #include "auth/basic/auth_basic.h" #include "auth/basic/Scheme.h" #include "auth/basic/User.h" diff --git a/src/auth/digest/Scheme.cc b/src/auth/digest/Scheme.cc index 31e8929928..3060589a86 100644 --- a/src/auth/digest/Scheme.cc +++ b/src/auth/digest/Scheme.cc @@ -30,7 +30,7 @@ * */ -#include "config.h" +#include "squid.h" #include "auth/digest/Scheme.h" #include "helper.h" diff --git a/src/auth/digest/User.cc b/src/auth/digest/User.cc index d7415b5118..c89d797b08 100644 --- a/src/auth/digest/User.cc +++ b/src/auth/digest/User.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "auth/digest/auth_digest.h" #include "auth/digest/User.h" #include "Debug.h" diff --git a/src/auth/digest/UserRequest.cc b/src/auth/digest/UserRequest.cc index ed842d5f19..ef76ff49b0 100644 --- a/src/auth/digest/UserRequest.cc +++ b/src/auth/digest/UserRequest.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "auth/digest/auth_digest.h" #include "auth/digest/User.h" #include "auth/digest/UserRequest.h" diff --git a/src/auth/digest/auth_digest.cc b/src/auth/digest/auth_digest.cc index 442a116b0f..1db50bfa19 100644 --- a/src/auth/digest/auth_digest.cc +++ b/src/auth/digest/auth_digest.cc @@ -37,7 +37,7 @@ * See acl.c for access control and client_side.c for auditing */ -#include "squid.h" +#include "squid-old.h" #include "rfc2617.h" #include "auth/digest/auth_digest.h" #include "auth/digest/Scheme.h" diff --git a/src/auth/negotiate/Scheme.cc b/src/auth/negotiate/Scheme.cc index 5b4f905647..ea98811007 100644 --- a/src/auth/negotiate/Scheme.cc +++ b/src/auth/negotiate/Scheme.cc @@ -30,7 +30,7 @@ * */ -#include "config.h" +#include "squid.h" #include "auth/negotiate/Scheme.h" #include "helper.h" diff --git a/src/auth/negotiate/User.cc b/src/auth/negotiate/User.cc index 729fa645c5..ca73352da2 100644 --- a/src/auth/negotiate/User.cc +++ b/src/auth/negotiate/User.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "auth/Config.h" #include "auth/negotiate/User.h" #include "Debug.h" diff --git a/src/auth/negotiate/UserRequest.cc b/src/auth/negotiate/UserRequest.cc index ed9815b9c0..f0712d66fe 100644 --- a/src/auth/negotiate/UserRequest.cc +++ b/src/auth/negotiate/UserRequest.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "auth/negotiate/auth_negotiate.h" #include "auth/negotiate/UserRequest.h" #include "auth/State.h" diff --git a/src/auth/negotiate/auth_negotiate.cc b/src/auth/negotiate/auth_negotiate.cc index b14df085fb..453ee98656 100644 --- a/src/auth/negotiate/auth_negotiate.cc +++ b/src/auth/negotiate/auth_negotiate.cc @@ -37,7 +37,7 @@ * See acl.c for access control and client_side.c for auditing */ -#include "squid.h" +#include "squid-old.h" #include "auth/negotiate/auth_negotiate.h" #include "auth/Gadgets.h" #include "auth/State.h" diff --git a/src/auth/ntlm/Scheme.cc b/src/auth/ntlm/Scheme.cc index b39c8f3cb0..e1236ea761 100644 --- a/src/auth/ntlm/Scheme.cc +++ b/src/auth/ntlm/Scheme.cc @@ -30,7 +30,7 @@ * */ -#include "config.h" +#include "squid.h" #include "auth/ntlm/auth_ntlm.h" #include "auth/ntlm/Scheme.h" #include "helper.h" diff --git a/src/auth/ntlm/User.cc b/src/auth/ntlm/User.cc index ebc7eff675..61457b0983 100644 --- a/src/auth/ntlm/User.cc +++ b/src/auth/ntlm/User.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "auth/Config.h" #include "auth/ntlm/User.h" #include "Debug.h" diff --git a/src/auth/ntlm/UserRequest.cc b/src/auth/ntlm/UserRequest.cc index 21494aa30b..b228d29dac 100644 --- a/src/auth/ntlm/UserRequest.cc +++ b/src/auth/ntlm/UserRequest.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "auth/ntlm/auth_ntlm.h" #include "auth/ntlm/UserRequest.h" #include "auth/State.h" diff --git a/src/auth/ntlm/auth_ntlm.cc b/src/auth/ntlm/auth_ntlm.cc index 656fa8cacd..4d2d3ad60a 100644 --- a/src/auth/ntlm/auth_ntlm.cc +++ b/src/auth/ntlm/auth_ntlm.cc @@ -37,7 +37,7 @@ * See acl.c for access control and client_side.c for auditing */ -#include "squid.h" +#include "squid-old.h" #include "auth/Gadgets.h" #include "auth/ntlm/auth_ntlm.h" #include "auth/ntlm/Scheme.h" diff --git a/src/base/AsyncCall.cc b/src/base/AsyncCall.cc index d6f981d069..88256d27f9 100644 --- a/src/base/AsyncCall.cc +++ b/src/base/AsyncCall.cc @@ -2,7 +2,7 @@ * $Id$ */ -#include "squid.h" +#include "squid-old.h" #include "base/AsyncCall.h" #include "base/AsyncCallQueue.h" #include "cbdata.h" diff --git a/src/base/AsyncCallQueue.cc b/src/base/AsyncCallQueue.cc index c58e03a10d..3c63810300 100644 --- a/src/base/AsyncCallQueue.cc +++ b/src/base/AsyncCallQueue.cc @@ -6,7 +6,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/AsyncCallQueue.h" #include "base/AsyncCall.h" diff --git a/src/base/AsyncCallQueue.h b/src/base/AsyncCallQueue.h index 8c135fee5d..451c40c9ce 100644 --- a/src/base/AsyncCallQueue.h +++ b/src/base/AsyncCallQueue.h @@ -7,7 +7,7 @@ #ifndef SQUID_ASYNCCALLQUEUE_H #define SQUID_ASYNCCALLQUEUE_H -#include "squid.h" +#include "squid-old.h" #include "base/AsyncCall.h" //class AsyncCall; diff --git a/src/base/AsyncJob.cc b/src/base/AsyncJob.cc index 34c5bc57ed..cbb3629cf7 100644 --- a/src/base/AsyncJob.cc +++ b/src/base/AsyncJob.cc @@ -2,7 +2,7 @@ * DEBUG: section 93 ICAP (RFC 3507) Client */ -#include "squid.h" +#include "squid-old.h" #include "base/AsyncCall.h" #include "base/AsyncJob.h" #include "base/AsyncJobCalls.h" diff --git a/src/base/RunnersRegistry.cc b/src/base/RunnersRegistry.cc index 700dd5653c..0a93a763d1 100644 --- a/src/base/RunnersRegistry.cc +++ b/src/base/RunnersRegistry.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "base/RunnersRegistry.h" #include #include diff --git a/src/base/TextException.cc b/src/base/TextException.cc index 6ec66b7794..30aab6c4bb 100644 --- a/src/base/TextException.cc +++ b/src/base/TextException.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #include "base/TextException.h" #include "Debug.h" #include "util.h" diff --git a/src/cache_cf.cc b/src/cache_cf.cc index b0a363f8fc..509ff91420 100644 --- a/src/cache_cf.cc +++ b/src/cache_cf.cc @@ -32,7 +32,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "acl/Acl.h" #include "acl/Gadgets.h" diff --git a/src/cache_diff.cc b/src/cache_diff.cc index 3c50a27db2..063aeb8b22 100644 --- a/src/cache_diff.cc +++ b/src/cache_diff.cc @@ -38,7 +38,7 @@ * Reports the percentage of common files and other stats */ -#include "squid.h" +#include "squid-old.h" typedef struct { const char *name; diff --git a/src/cache_manager.cc b/src/cache_manager.cc index 88f195786c..b45cf50c2e 100644 --- a/src/cache_manager.cc +++ b/src/cache_manager.cc @@ -33,7 +33,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "CacheManager.h" #include "comm/Connection.h" diff --git a/src/carp.cc b/src/carp.cc index 1b552f9842..7918a48e87 100644 --- a/src/carp.cc +++ b/src/carp.cc @@ -34,7 +34,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "HttpRequest.h" #include "mgr/Registration.h" #include "Store.h" diff --git a/src/cbdata.cc b/src/cbdata.cc index cc92cd0c07..54ee8e6161 100644 --- a/src/cbdata.cc +++ b/src/cbdata.cc @@ -48,7 +48,7 @@ * when finished. */ -#include "config.h" +#include "squid.h" #include "cbdata.h" #include "mgr/Registration.h" #include "Store.h" diff --git a/src/cbdata.h b/src/cbdata.h index f42ba42f8f..d23c51e7c8 100644 --- a/src/cbdata.h +++ b/src/cbdata.h @@ -34,7 +34,7 @@ #ifndef SQUID_CBDATA_H #define SQUID_CBDATA_H -#include "squid.h" +#include "squid-old.h" /** \defgroup CBDATAAPI Callback Data Allocator API diff --git a/src/clientStream.cc b/src/clientStream.cc index 1744dabc17..1ecbc523b7 100644 --- a/src/clientStream.cc +++ b/src/clientStream.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "clientStream.h" #include "HttpReply.h" #include "HttpRequest.h" diff --git a/src/client_db.cc b/src/client_db.cc index cbf1387eb7..0df881542e 100644 --- a/src/client_db.cc +++ b/src/client_db.cc @@ -32,7 +32,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "event.h" #include "format/Token.h" #include "ClientInfo.h" diff --git a/src/client_side.cc b/src/client_side.cc index 7543265d0a..2b9d35adbf 100644 --- a/src/client_side.cc +++ b/src/client_side.cc @@ -81,7 +81,7 @@ * data flow. */ -#include "squid.h" +#include "squid-old.h" #include "acl/FilledChecklist.h" #if USE_AUTH diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc index 9ee0a8167e..aeb726d018 100644 --- a/src/client_side_reply.cc +++ b/src/client_side_reply.cc @@ -31,13 +31,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * */ -#include "config.h" +#include "squid.h" /* for ClientActiveRequests global */ #include "dlink.h" /* old includes without reasons given. */ -#include "squid.h" +#include "squid-old.h" #include "acl/FilledChecklist.h" #include "acl/Gadgets.h" #if USE_AUTH diff --git a/src/client_side_request.cc b/src/client_side_request.cc index 4663c156f3..e08c91aefa 100644 --- a/src/client_side_request.cc +++ b/src/client_side_request.cc @@ -42,7 +42,7 @@ * From that point on it's up to reply management. */ -#include "squid.h" +#include "squid-old.h" #include "acl/FilledChecklist.h" #include "acl/Gadgets.h" #if USE_ADAPTATION diff --git a/src/client_side_request.h b/src/client_side_request.h index c50c1e5c45..5e84030a9f 100644 --- a/src/client_side_request.h +++ b/src/client_side_request.h @@ -35,7 +35,7 @@ #ifndef SQUID_CLIENTSIDEREQUEST_H #define SQUID_CLIENTSIDEREQUEST_H -#include "squid.h" +#include "squid-old.h" #include "HttpHeader.h" #include "clientStream.h" #include "client_side.h" diff --git a/src/comm.cc b/src/comm.cc index 908b10a141..aca3385789 100644 --- a/src/comm.cc +++ b/src/comm.cc @@ -32,7 +32,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "base/AsyncCall.h" #include "StoreIOBuffer.h" #include "comm.h" diff --git a/src/comm.h b/src/comm.h index 34c4461b9b..2cd9b6d229 100644 --- a/src/comm.h +++ b/src/comm.h @@ -1,7 +1,7 @@ #ifndef __COMM_H__ #define __COMM_H__ -#include "squid.h" +#include "squid-old.h" #include "AsyncEngine.h" #include "base/AsyncCall.h" #include "CommCalls.h" diff --git a/src/comm/AcceptLimiter.cc b/src/comm/AcceptLimiter.cc index 23f7b8ff91..5d3eb66e76 100644 --- a/src/comm/AcceptLimiter.cc +++ b/src/comm/AcceptLimiter.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "comm/AcceptLimiter.h" #include "comm/Connection.h" #include "comm/TcpAcceptor.h" diff --git a/src/comm/ConnOpener.cc b/src/comm/ConnOpener.cc index 84f30c3b2a..2429c8c7ab 100644 --- a/src/comm/ConnOpener.cc +++ b/src/comm/ConnOpener.cc @@ -2,7 +2,7 @@ * DEBUG: section 05 Socket Connection Opener */ -#include "config.h" +#include "squid.h" #include "comm/ConnOpener.h" #include "comm/Connection.h" #include "comm/Loops.h" diff --git a/src/comm/Connection.cc b/src/comm/Connection.cc index 1c50995fd5..20744d9eb1 100644 --- a/src/comm/Connection.cc +++ b/src/comm/Connection.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "cbdata.h" #include "comm.h" #include "comm/Connection.h" diff --git a/src/comm/IoCallback.cc b/src/comm/IoCallback.cc index c8806e28da..4793e6a752 100644 --- a/src/comm/IoCallback.cc +++ b/src/comm/IoCallback.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "ClientInfo.h" #include "comm/Connection.h" #include "comm/IoCallback.h" diff --git a/src/comm/ModDevPoll.cc b/src/comm/ModDevPoll.cc index f750a82f54..525587f719 100644 --- a/src/comm/ModDevPoll.cc +++ b/src/comm/ModDevPoll.cc @@ -50,11 +50,11 @@ * modules from creating several versions of the same function simultaneously. */ -#include "config.h" +#include "squid.h" #if USE_DEVPOLL -#include "squid.h" +#include "squid-old.h" #include "comm/Loops.h" #include "fde.h" #include "mgr/Registration.h" diff --git a/src/comm/ModEpoll.cc b/src/comm/ModEpoll.cc index 3e53cce0a0..9a8f986905 100644 --- a/src/comm/ModEpoll.cc +++ b/src/comm/ModEpoll.cc @@ -51,11 +51,11 @@ * */ -#include "config.h" +#include "squid.h" #if USE_EPOLL -#include "squid.h" +#include "squid-old.h" #include "comm/Loops.h" #include "fde.h" #include "mgr/Registration.h" diff --git a/src/comm/ModKqueue.cc b/src/comm/ModKqueue.cc index de3616cf17..4dab6e623f 100644 --- a/src/comm/ModKqueue.cc +++ b/src/comm/ModKqueue.cc @@ -52,11 +52,11 @@ * so deferred reads aren't required. * -- adrian */ -#include "config.h" +#include "squid.h" #if USE_KQUEUE -#include "squid.h" +#include "squid-old.h" #include "comm/Loops.h" #include "fde.h" #include "Store.h" diff --git a/src/comm/ModPoll.cc b/src/comm/ModPoll.cc index 53f79b358e..2ee0ab388f 100644 --- a/src/comm/ModPoll.cc +++ b/src/comm/ModPoll.cc @@ -30,11 +30,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * */ -#include "config.h" +#include "squid.h" #if USE_POLL -#include "squid.h" +#include "squid-old.h" #include "comm/Connection.h" #include "comm/Loops.h" #include "fde.h" diff --git a/src/comm/ModSelect.cc b/src/comm/ModSelect.cc index f8aa8833bb..c882569be7 100644 --- a/src/comm/ModSelect.cc +++ b/src/comm/ModSelect.cc @@ -30,11 +30,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * */ -#include "config.h" +#include "squid.h" #if USE_SELECT -#include "squid.h" +#include "squid-old.h" #include "comm/Connection.h" #include "comm/Loops.h" #include "ICP.h" diff --git a/src/comm/ModSelectWin32.cc b/src/comm/ModSelectWin32.cc index e378dd31a4..5eb36a2af4 100644 --- a/src/comm/ModSelectWin32.cc +++ b/src/comm/ModSelectWin32.cc @@ -31,11 +31,11 @@ * */ -#include "config.h" +#include "squid.h" #if USE_SELECT_WIN32 -#include "squid.h" +#include "squid-old.h" #include "comm/Loops.h" #include "fde.h" #include "mgr/Registration.h" diff --git a/src/comm/TcpAcceptor.cc b/src/comm/TcpAcceptor.cc index f3feb7b170..f8ceeedb69 100644 --- a/src/comm/TcpAcceptor.cc +++ b/src/comm/TcpAcceptor.cc @@ -32,7 +32,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "base/TextException.h" #include "CommCalls.h" #include "comm/AcceptLimiter.h" diff --git a/src/comm/Write.cc b/src/comm/Write.cc index 88783d75a2..641e7bda8f 100644 --- a/src/comm/Write.cc +++ b/src/comm/Write.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #if USE_DELAY_POOLS #include "ClientInfo.h" #endif diff --git a/src/debug.cc b/src/debug.cc index 05ef8f6bff..a2eb7d2c4f 100644 --- a/src/debug.cc +++ b/src/debug.cc @@ -32,7 +32,7 @@ * */ -#include "config.h" +#include "squid.h" #include "Debug.h" #include "SquidTime.h" #include "util.h" diff --git a/src/delay_pools.cc b/src/delay_pools.cc index 890e3fdb39..3d5664aa0c 100644 --- a/src/delay_pools.cc +++ b/src/delay_pools.cc @@ -39,10 +39,10 @@ \ingroup DelayPoolsAPI */ -#include "config.h" +#include "squid.h" #if USE_DELAY_POOLS -#include "squid.h" +#include "squid-old.h" #include "mgr/Registration.h" #include "DelaySpec.h" #include "DelayPools.h" diff --git a/src/disk.cc b/src/disk.cc index 04e1a53951..92724c54a6 100644 --- a/src/disk.cc +++ b/src/disk.cc @@ -32,7 +32,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "comm/Loops.h" #include "fde.h" #include "MemBuf.h" diff --git a/src/dlink.cc b/src/dlink.cc index 88120f1d70..4ec5c29966 100644 --- a/src/dlink.cc +++ b/src/dlink.cc @@ -1,7 +1,7 @@ /* * $Id$ */ -#include "config.h" +#include "squid.h" #include "dlink.h" /* dlink are Mem-pooled */ diff --git a/src/dns.cc b/src/dns.cc index cf874d412e..a147aa20e4 100644 --- a/src/dns.cc +++ b/src/dns.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "Store.h" #include "wordlist.h" #include "SquidTime.h" diff --git a/src/dns_internal.cc b/src/dns_internal.cc index 3625dc8cc4..9d88a7f348 100644 --- a/src/dns_internal.cc +++ b/src/dns_internal.cc @@ -32,7 +32,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "comm/Connection.h" #include "comm/ConnOpener.h" #include "comm.h" diff --git a/src/dnsserver.cc b/src/dnsserver.cc index e9a9f2bbac..6ad1771176 100644 --- a/src/dnsserver.cc +++ b/src/dnsserver.cc @@ -30,7 +30,7 @@ * */ -#include "config.h" +#include "squid.h" #if HAVE_UNISTD_H #include diff --git a/src/errorpage.cc b/src/errorpage.cc index 39e10c6c02..53803ea6d3 100644 --- a/src/errorpage.cc +++ b/src/errorpage.cc @@ -31,7 +31,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * */ -#include "config.h" +#include "squid.h" #include "comm/Connection.h" #include "comm/Write.h" #include "errorpage.h" diff --git a/src/errorpage.h b/src/errorpage.h index 494eff8e21..5b2bcf2051 100644 --- a/src/errorpage.h +++ b/src/errorpage.h @@ -34,7 +34,7 @@ #ifndef SQUID_ERRORPAGE_H #define SQUID_ERRORPAGE_H -#include "squid.h" +#include "squid-old.h" #if USE_AUTH #include "auth/UserRequest.h" #endif diff --git a/src/esi/Assign.cc b/src/esi/Assign.cc index 6b5aed741e..04de070bcb 100644 --- a/src/esi/Assign.cc +++ b/src/esi/Assign.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" /* MS Visual Studio Projects are monolithic, so we need the following * #if to exclude the ESI code from compile process when not needed. diff --git a/src/esi/Assign.h b/src/esi/Assign.h index 744ef37ca8..563b06a4f2 100644 --- a/src/esi/Assign.h +++ b/src/esi/Assign.h @@ -36,7 +36,7 @@ #ifndef SQUID_ESIASSIGN_H #define SQUID_ESIASSIGN_H -#include "squid.h" +#include "squid-old.h" #include "esi/Element.h" #include "SquidString.h" #include "esi/VarState.h" diff --git a/src/esi/Attempt.h b/src/esi/Attempt.h index e7b0f5d5e9..ee4f85f6ff 100644 --- a/src/esi/Attempt.h +++ b/src/esi/Attempt.h @@ -36,7 +36,7 @@ #ifndef SQUID_ESIATTEMPT_H #define SQUID_ESIATTEMPT_H -#include "squid.h" +#include "squid-old.h" #include "esi/Element.h" #include "esi/Sequence.h" diff --git a/src/esi/Context.cc b/src/esi/Context.cc index 2db6adbcf5..db7a77e8df 100644 --- a/src/esi/Context.cc +++ b/src/esi/Context.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" /* MS Visual Studio Projects are monolithic, so we need the following * #if to exclude the ESI code from compile process when not needed. diff --git a/src/esi/CustomParser.cc b/src/esi/CustomParser.cc index d9bfba8f43..04f869facd 100644 --- a/src/esi/CustomParser.cc +++ b/src/esi/CustomParser.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "esi/CustomParser.h" #include "Trie.h" #include "TrieCharTransform.h" diff --git a/src/esi/ElementList.h b/src/esi/ElementList.h index 15ff033b0a..96977f54e3 100644 --- a/src/esi/ElementList.h +++ b/src/esi/ElementList.h @@ -36,7 +36,7 @@ #ifndef SQUID_ELEMENTLIST_H #define SQUID_ELEMENTLIST_H -#include "squid.h" +#include "squid-old.h" #include "esi/Element.h" class ElementList diff --git a/src/esi/Esi.cc b/src/esi/Esi.cc index f547703d9b..5fa1b68b7e 100644 --- a/src/esi/Esi.cc +++ b/src/esi/Esi.cc @@ -31,7 +31,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" /* MS Visual Studio Projects are monolithic, so we need the following * #if to exclude the ESI code from compile process when not needed. diff --git a/src/esi/Except.h b/src/esi/Except.h index 7c684b0cd4..71b331b2c2 100644 --- a/src/esi/Except.h +++ b/src/esi/Except.h @@ -36,7 +36,7 @@ #ifndef SQUID_ESIEXCEPT_H #define SQUID_ESIEXCEPT_H -#include "squid.h" +#include "squid-old.h" #include "esi/Element.h" #include "esi/Sequence.h" diff --git a/src/esi/ExpatParser.cc b/src/esi/ExpatParser.cc index 3019af08ec..786c832153 100644 --- a/src/esi/ExpatParser.cc +++ b/src/esi/ExpatParser.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #if USE_SQUID_ESI && HAVE_LIBEXPAT diff --git a/src/esi/Expression.cc b/src/esi/Expression.cc index b81b5e2d62..a230ea6267 100644 --- a/src/esi/Expression.cc +++ b/src/esi/Expression.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "esi/Expression.h" /* stack precedence rules: diff --git a/src/esi/Expression.h b/src/esi/Expression.h index 1ebd159ed3..60b83e22a2 100644 --- a/src/esi/Expression.h +++ b/src/esi/Expression.h @@ -36,7 +36,7 @@ #ifndef SQUID_ESIEXPRESSION_H #define SQUID_ESIEXPRESSION_H -#include "squid.h" +#include "squid-old.h" class ESIExpression { diff --git a/src/esi/Include.cc b/src/esi/Include.cc index 54880c5349..a850b2c9d4 100644 --- a/src/esi/Include.cc +++ b/src/esi/Include.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" /* MS Visual Studio Projects are monolithic, so we need the following * #if to exclude the ESI code from compile process when not needed. diff --git a/src/esi/Include.h b/src/esi/Include.h index a364d5ebd1..79bb5d4138 100644 --- a/src/esi/Include.h +++ b/src/esi/Include.h @@ -36,7 +36,7 @@ #ifndef SQUID_ESIINCLUDE_H #define SQUID_ESIINCLUDE_H -#include "squid.h" +#include "squid-old.h" #include "esi/Segment.h" #include "esi/Element.h" #include "esi/Context.h" diff --git a/src/esi/Libxml2Parser.cc b/src/esi/Libxml2Parser.cc index 8f1a7faa6a..359849a904 100644 --- a/src/esi/Libxml2Parser.cc +++ b/src/esi/Libxml2Parser.cc @@ -37,7 +37,7 @@ * mail@joachim-bauch.de */ -#include "squid.h" +#include "squid-old.h" #if USE_SQUID_ESI && HAVE_LIBXML2 diff --git a/src/esi/Literal.h b/src/esi/Literal.h index ab946aa32b..b74c608b21 100644 --- a/src/esi/Literal.h +++ b/src/esi/Literal.h @@ -36,7 +36,7 @@ #ifndef SQUID_ESILITERAL_H #define SQUID_ESILITERAL_H -#include "squid.h" +#include "squid-old.h" #include "esi/Element.h" class ESIContext; diff --git a/src/esi/Module.cc b/src/esi/Module.cc index 71b9be035e..16d1bc9aa2 100644 --- a/src/esi/Module.cc +++ b/src/esi/Module.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #include "esi/Module.h" #include "esi/CustomParser.h" #include "esi/Libxml2Parser.h" diff --git a/src/esi/Parser.cc b/src/esi/Parser.cc index e40b821365..75e9c6e40a 100644 --- a/src/esi/Parser.cc +++ b/src/esi/Parser.cc @@ -32,7 +32,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "esi/Parser.h" char *ESIParser::Type = NULL; diff --git a/src/esi/Segment.cc b/src/esi/Segment.cc index 8ed6ddc6a4..32ca9fcced 100644 --- a/src/esi/Segment.cc +++ b/src/esi/Segment.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "esi/Segment.h" #include "SquidString.h" diff --git a/src/esi/Sequence.cc b/src/esi/Sequence.cc index bb4035c7d0..d1fbce1d3c 100644 --- a/src/esi/Sequence.cc +++ b/src/esi/Sequence.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" /* MS Visual Studio Projects are monolithic, so we need the following * #if to exclude the ESI code from compile process when not needed. diff --git a/src/esi/Sequence.h b/src/esi/Sequence.h index 0fd848cef0..1f20c6b78e 100644 --- a/src/esi/Sequence.h +++ b/src/esi/Sequence.h @@ -36,7 +36,7 @@ #ifndef SQUID_ESISEQUENCE_H #define SQUID_ESISEQUENCE_H -#include "squid.h" +#include "squid-old.h" #include "esi/Element.h" #include "esi/ElementList.h" diff --git a/src/esi/Var.h b/src/esi/Var.h index 412414ced7..9ea8c245a4 100644 --- a/src/esi/Var.h +++ b/src/esi/Var.h @@ -36,7 +36,7 @@ #ifndef SQUID_ESIVAR_H #define SQUID_ESIVAR_H -#include "squid.h" +#include "squid-old.h" #include "esi/Element.h" #include "esi/Sequence.h" diff --git a/src/esi/VarState.cc b/src/esi/VarState.cc index ba414c6b1d..8b899745e9 100644 --- a/src/esi/VarState.cc +++ b/src/esi/VarState.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "esi/VarState.h" #include "HttpReply.h" diff --git a/src/eui/Config.cc b/src/eui/Config.cc index 3135fc6a66..8aac9ad723 100644 --- a/src/eui/Config.cc +++ b/src/eui/Config.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "eui/Config.h" Eui::EuiConfig Eui::TheConfig; diff --git a/src/eui/Eui48.cc b/src/eui/Eui48.cc index b65518f0f7..b05f8c3fe3 100644 --- a/src/eui/Eui48.cc +++ b/src/eui/Eui48.cc @@ -32,7 +32,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "config.h" +#include "squid.h" #if USE_SQUID_EUI diff --git a/src/eui/Eui64.cc b/src/eui/Eui64.cc index bfbc33b875..18b9995da4 100644 --- a/src/eui/Eui64.cc +++ b/src/eui/Eui64.cc @@ -5,7 +5,7 @@ * Copyright (c) 2009, Amos Jeffries */ -#include "config.h" +#include "squid.h" #if USE_SQUID_EUI diff --git a/src/event.cc b/src/event.cc index 2cce5b57a9..33185b5f86 100644 --- a/src/event.cc +++ b/src/event.cc @@ -32,7 +32,7 @@ * */ -#include "config.h" +#include "squid.h" #include "compat/drand48.h" #include "event.h" #include "mgr/Registration.h" diff --git a/src/event.h b/src/event.h index 91e9665d5a..a8d8c459be 100644 --- a/src/event.h +++ b/src/event.h @@ -34,7 +34,7 @@ #ifndef SQUID_EVENT_H #define SQUID_EVENT_H -#include "squid.h" +#include "squid-old.h" #include "Array.h" #include "AsyncEngine.h" diff --git a/src/external_acl.cc b/src/external_acl.cc index 3d3d9bb2a4..a358895fb9 100644 --- a/src/external_acl.cc +++ b/src/external_acl.cc @@ -40,7 +40,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "mgr/Registration.h" #include "ExternalACL.h" #include "ExternalACLEntry.h" diff --git a/src/fd.cc b/src/fd.cc index 36a26b8adf..215dafb5c8 100644 --- a/src/fd.cc +++ b/src/fd.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "comm/Loops.h" #include "fde.h" #include "SquidTime.h" diff --git a/src/fde.cc b/src/fde.cc index 49bd5300b8..61854c6658 100644 --- a/src/fde.cc +++ b/src/fde.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "fde.h" #include "SquidTime.h" #include "Store.h" diff --git a/src/filemap.cc b/src/filemap.cc index 23d11e38eb..bf4b5d50f0 100644 --- a/src/filemap.cc +++ b/src/filemap.cc @@ -30,7 +30,7 @@ * */ -#include "config.h" +#include "squid.h" #include "Debug.h" #include "FileMap.h" diff --git a/src/format/Config.cc b/src/format/Config.cc index 7ac1272d2f..991bcc45d4 100644 --- a/src/format/Config.cc +++ b/src/format/Config.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "format/Config.h" #include "protos.h" #include diff --git a/src/format/Format.cc b/src/format/Format.cc index d5a281beb6..18348e8148 100644 --- a/src/format/Format.cc +++ b/src/format/Format.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "AccessLogEntry.h" #include "comm/Connection.h" #include "err_detail_type.h" diff --git a/src/format/Quoting.cc b/src/format/Quoting.cc index badff8814b..102b168f4a 100644 --- a/src/format/Quoting.cc +++ b/src/format/Quoting.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "format/Quoting.h" static const char c2x[] = diff --git a/src/format/Token.cc b/src/format/Token.cc index 5a61d8330e..6859e0a31c 100644 --- a/src/format/Token.cc +++ b/src/format/Token.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "format/Config.h" #include "format/Token.h" #include "format/TokenTableEntry.h" diff --git a/src/forward.cc b/src/forward.cc index 5e69efb06f..168e2c53e7 100644 --- a/src/forward.cc +++ b/src/forward.cc @@ -31,7 +31,7 @@ */ -#include "squid.h" +#include "squid-old.h" #include "forward.h" #include "acl/FilledChecklist.h" #include "acl/Gadgets.h" diff --git a/src/fqdncache.cc b/src/fqdncache.cc index 831718ecff..ad1a5f60b7 100644 --- a/src/fqdncache.cc +++ b/src/fqdncache.cc @@ -32,7 +32,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "cbdata.h" #include "DnsLookupDetails.h" #include "event.h" diff --git a/src/fs/Module.cc b/src/fs/Module.cc index da5951204b..5c900b5dbf 100644 --- a/src/fs/Module.cc +++ b/src/fs/Module.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #include "Module.h" #if defined(HAVE_FS_UFS) || defined(HAVE_FS_AUFS) || defined(HAVE_FS_DISKD) #include "fs/ufs/StoreFSufs.h" diff --git a/src/fs/aufs/StoreFSaufs.cc b/src/fs/aufs/StoreFSaufs.cc index c0b75465f5..39d43f6a8f 100644 --- a/src/fs/aufs/StoreFSaufs.cc +++ b/src/fs/aufs/StoreFSaufs.cc @@ -35,10 +35,10 @@ /* TODO: remove this file as unused */ -#include "config.h" +#include "squid.h" #if 0 -#include "squid.h" +#include "squid-old.h" #include "StoreFileSystem.h" #include "DiskIO/DiskIOModule.h" #endif diff --git a/src/fs/coss/StoreFScoss.cc b/src/fs/coss/StoreFScoss.cc index fc89f00309..b9933b8583 100644 --- a/src/fs/coss/StoreFScoss.cc +++ b/src/fs/coss/StoreFScoss.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "config.h" +#include "squid.h" #include "StoreFileSystem.h" #include "StoreFScoss.h" #include "mgr/Registration.h" diff --git a/src/fs/coss/store_dir_coss.cc b/src/fs/coss/store_dir_coss.cc index f46e398ad7..2d6b97f8e2 100644 --- a/src/fs/coss/store_dir_coss.cc +++ b/src/fs/coss/store_dir_coss.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "CossSwapDir.h" #include "Store.h" diff --git a/src/fs/coss/store_io_coss.cc b/src/fs/coss/store_io_coss.cc index 8019d13cca..c19642469f 100644 --- a/src/fs/coss/store_io_coss.cc +++ b/src/fs/coss/store_io_coss.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "CossSwapDir.h" #include "Store.h" #include "store_coss.h" diff --git a/src/fs/diskd/StoreFSdiskd.cc b/src/fs/diskd/StoreFSdiskd.cc index 4126c12760..1c375f55da 100644 --- a/src/fs/diskd/StoreFSdiskd.cc +++ b/src/fs/diskd/StoreFSdiskd.cc @@ -35,7 +35,7 @@ /* TODO: remove this file as unused */ -#include "config.h" +#include "squid.h" #if 0 #include "StoreFileSystem.h" #include "DiskIO/DiskIOModule.h" diff --git a/src/fs/rock/RockIoRequests.cc b/src/fs/rock/RockIoRequests.cc index c4689252f1..45d07b1b7e 100644 --- a/src/fs/rock/RockIoRequests.cc +++ b/src/fs/rock/RockIoRequests.cc @@ -4,7 +4,7 @@ * DEBUG: section 79 Disk IO Routines */ -#include "config.h" +#include "squid.h" #include "fs/rock/RockIoRequests.h" CBDATA_NAMESPACED_CLASS_INIT(Rock, ReadRequest); diff --git a/src/fs/rock/RockIoState.cc b/src/fs/rock/RockIoState.cc index e73c6a6878..d755efe90c 100644 --- a/src/fs/rock/RockIoState.cc +++ b/src/fs/rock/RockIoState.cc @@ -4,7 +4,7 @@ * DEBUG: section 79 Disk IO Routines */ -#include "config.h" +#include "squid.h" #include "MemObject.h" #include "Parsing.h" #include "DiskIO/DiskIOModule.h" diff --git a/src/fs/rock/RockRebuild.cc b/src/fs/rock/RockRebuild.cc index 18688fc48b..94eea98707 100644 --- a/src/fs/rock/RockRebuild.cc +++ b/src/fs/rock/RockRebuild.cc @@ -4,7 +4,7 @@ * DEBUG: section 79 Disk IO Routines */ -#include "config.h" +#include "squid.h" #include "fs/rock/RockRebuild.h" #include "fs/rock/RockSwapDir.h" #include "fs/rock/RockDbCell.h" diff --git a/src/fs/rock/RockStoreFileSystem.cc b/src/fs/rock/RockStoreFileSystem.cc index 9f7ef6b77f..05960a0876 100644 --- a/src/fs/rock/RockStoreFileSystem.cc +++ b/src/fs/rock/RockStoreFileSystem.cc @@ -4,7 +4,7 @@ * DEBUG: section 92 Storage File System */ -#include "config.h" +#include "squid.h" #include "fs/rock/RockStoreFileSystem.h" #include "fs/rock/RockSwapDir.h" diff --git a/src/fs/rock/RockSwapDir.cc b/src/fs/rock/RockSwapDir.cc index ab56abdf6b..4d8e7b60e0 100644 --- a/src/fs/rock/RockSwapDir.cc +++ b/src/fs/rock/RockSwapDir.cc @@ -4,7 +4,7 @@ * DEBUG: section 47 Store Directory Routines */ -#include "config.h" +#include "squid.h" #include "ConfigOption.h" #include "DiskIO/DiskIOModule.h" #include "DiskIO/DiskIOStrategy.h" diff --git a/src/fs/ufs/StoreFSufs.cc b/src/fs/ufs/StoreFSufs.cc index 79c8bf3c69..18fe2f6025 100644 --- a/src/fs/ufs/StoreFSufs.cc +++ b/src/fs/ufs/StoreFSufs.cc @@ -35,7 +35,7 @@ /*TODO: remove this file as unused*/ -#include "config.h" +#include "squid.h" #if 0 #include "StoreFileSystem.h" #endif diff --git a/src/fs/ufs/store_dir_ufs.cc b/src/fs/ufs/store_dir_ufs.cc index 258fda0685..bebcda5c78 100644 --- a/src/fs/ufs/store_dir_ufs.cc +++ b/src/fs/ufs/store_dir_ufs.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "Store.h" #include "fde.h" #include "ufscommon.h" diff --git a/src/fs/ufs/store_io_ufs.cc b/src/fs/ufs/store_io_ufs.cc index e493283deb..a9d21c9aa4 100644 --- a/src/fs/ufs/store_io_ufs.cc +++ b/src/fs/ufs/store_io_ufs.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "Store.h" #include "ufscommon.h" #include "Generic.h" diff --git a/src/fs/ufs/ufscommon.cc b/src/fs/ufs/ufscommon.cc index 0adb4b18e6..3f0a96ddd6 100644 --- a/src/fs/ufs/ufscommon.cc +++ b/src/fs/ufs/ufscommon.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "config.h" +#include "squid.h" #include "ufscommon.h" #include "Store.h" #include "fde.h" diff --git a/src/ftp.cc b/src/ftp.cc index 7b7e6edd80..a34a726fad 100644 --- a/src/ftp.cc +++ b/src/ftp.cc @@ -32,7 +32,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "comm.h" #include "comm/ConnOpener.h" #include "CommCalls.h" diff --git a/src/gopher.cc b/src/gopher.cc index 894d72f0af..e560f04e68 100644 --- a/src/gopher.cc +++ b/src/gopher.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "comm/Write.h" #include "errorpage.h" #include "Store.h" diff --git a/src/helper.cc b/src/helper.cc index 43e802faa7..d3bfef0c7d 100644 --- a/src/helper.cc +++ b/src/helper.cc @@ -32,7 +32,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "base/AsyncCbdataCalls.h" #include "comm.h" #include "comm/Connection.h" diff --git a/src/helper.h b/src/helper.h index a0ddcded4a..7d70316a07 100644 --- a/src/helper.h +++ b/src/helper.h @@ -33,7 +33,7 @@ #ifndef SQUID_HELPER_H #define SQUID_HELPER_H -#include "squid.h" +#include "squid-old.h" #include "base/AsyncCall.h" #include "cbdata.h" #include "comm/forward.h" diff --git a/src/htcp.cc b/src/htcp.cc index 1b8272b353..b243ee55e5 100644 --- a/src/htcp.cc +++ b/src/htcp.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "AccessLogEntry.h" #include "acl/FilledChecklist.h" #include "acl/Acl.h" diff --git a/src/http.cc b/src/http.cc index 60d0738ce2..b8dc201198 100644 --- a/src/http.cc +++ b/src/http.cc @@ -38,7 +38,7 @@ * have a look into http-anon.c to get more informations. */ -#include "squid.h" +#include "squid-old.h" #include "acl/FilledChecklist.h" #if USE_AUTH diff --git a/src/icmp/Icmp.cc b/src/icmp/Icmp.cc index 329c64ddb2..c6eb62ffea 100644 --- a/src/icmp/Icmp.cc +++ b/src/icmp/Icmp.cc @@ -31,7 +31,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * */ -#include "squid.h" +#include "squid-old.h" #include "Icmp.h" #include "SquidTime.h" #include "Debug.h" diff --git a/src/icmp/Icmp4.cc b/src/icmp/Icmp4.cc index 5c24f6d23e..e1203ab6ee 100644 --- a/src/icmp/Icmp4.cc +++ b/src/icmp/Icmp4.cc @@ -33,7 +33,7 @@ */ //#define SQUID_HELPER 1 -#include "squid.h" +#include "squid-old.h" #if USE_ICMP diff --git a/src/icmp/Icmp6.cc b/src/icmp/Icmp6.cc index d8dcaa4b20..b2d8c1690a 100644 --- a/src/icmp/Icmp6.cc +++ b/src/icmp/Icmp6.cc @@ -33,7 +33,7 @@ */ //#define SQUID_HELPER 1 -#include "squid.h" +#include "squid-old.h" #if USE_ICMP diff --git a/src/icmp/IcmpPinger.cc b/src/icmp/IcmpPinger.cc index cea2b37f6a..6d1c66c721 100644 --- a/src/icmp/IcmpPinger.cc +++ b/src/icmp/IcmpPinger.cc @@ -34,7 +34,7 @@ #define SQUID_HELPER 1 -#include "squid.h" +#include "squid-old.h" #if USE_ICMP diff --git a/src/icmp/IcmpSquid.cc b/src/icmp/IcmpSquid.cc index 9d46004bd6..46f9e5e800 100644 --- a/src/icmp/IcmpSquid.cc +++ b/src/icmp/IcmpSquid.cc @@ -32,7 +32,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "comm.h" #include "comm/Loops.h" #include "icmp/IcmpSquid.h" diff --git a/src/icmp/net_db.cc b/src/icmp/net_db.cc index 3cfb03e4cd..d8beeec6ad 100644 --- a/src/icmp/net_db.cc +++ b/src/icmp/net_db.cc @@ -38,7 +38,7 @@ * (adrian@squid-cache.org) to sort them out. */ -#include "squid.h" +#include "squid-old.h" #include "icmp/net_db.h" #include "log/File.h" #include "cbdata.h" diff --git a/src/icmp/pinger.cc b/src/icmp/pinger.cc index 8bcd798dec..1bbefdd122 100644 --- a/src/icmp/pinger.cc +++ b/src/icmp/pinger.cc @@ -63,7 +63,7 @@ * ICP_OP_MISS_NOFETCH for sites which it cannot ping. */ -#include "squid.h" +#include "squid-old.h" #include "SquidTime.h" #if USE_ICMP diff --git a/src/icmp/testIcmp.cc b/src/icmp/testIcmp.cc index 2532f4e72a..f628abde36 100644 --- a/src/icmp/testIcmp.cc +++ b/src/icmp/testIcmp.cc @@ -1,7 +1,7 @@ #define SQUID_UNIT_TEST 1 #define SQUID_HELPER 1 -#include "squid.h" +#include "squid-old.h" #include diff --git a/src/icp_v2.cc b/src/icp_v2.cc index 0b2ec86f2c..436f36df84 100644 --- a/src/icp_v2.cc +++ b/src/icp_v2.cc @@ -35,7 +35,7 @@ \ingroup ServerProtocolICPAPI */ -#include "squid.h" +#include "squid-old.h" #include "Store.h" #include "comm.h" #include "comm/Loops.h" diff --git a/src/icp_v3.cc b/src/icp_v3.cc index 510dbcb005..2caa62e41b 100644 --- a/src/icp_v3.cc +++ b/src/icp_v3.cc @@ -37,7 +37,7 @@ \ingroup ServerProtocolICPAPI */ -#include "squid.h" +#include "squid-old.h" #include "Store.h" #include "ICP.h" #include "HttpRequest.h" diff --git a/src/ident/AclIdent.cc b/src/ident/AclIdent.cc index 47a6885ece..ff164a3528 100644 --- a/src/ident/AclIdent.cc +++ b/src/ident/AclIdent.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #if USE_IDENT diff --git a/src/ident/Ident.cc b/src/ident/Ident.cc index ec3ee17bd1..46d97b851f 100644 --- a/src/ident/Ident.cc +++ b/src/ident/Ident.cc @@ -32,7 +32,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #if USE_IDENT diff --git a/src/int.cc b/src/int.cc index 1da700ab59..6076c01baa 100644 --- a/src/int.cc +++ b/src/int.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" int isPowTen(int count) { diff --git a/src/internal.cc b/src/internal.cc index 86ee69c676..090a3e71dd 100644 --- a/src/internal.cc +++ b/src/internal.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "CacheManager.h" #include "comm/Connection.h" #include "errorpage.h" diff --git a/src/ip/Address.cc b/src/ip/Address.cc index e5f9bea485..b577c75074 100644 --- a/src/ip/Address.cc +++ b/src/ip/Address.cc @@ -34,7 +34,7 @@ * */ -#include "config.h" +#include "squid.h" #include "compat/inet_ntop.h" #include "compat/getaddrinfo.h" #include "Debug.h" diff --git a/src/ip/Intercept.cc b/src/ip/Intercept.cc index 7d470ba56b..446b3eacc8 100644 --- a/src/ip/Intercept.cc +++ b/src/ip/Intercept.cc @@ -30,7 +30,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * */ -#include "config.h" +#include "squid.h" #include "comm/Connection.h" #include "ip/Intercept.h" #include "fde.h" diff --git a/src/ip/QosConfig.cc b/src/ip/QosConfig.cc index cae27f1800..1bda01f6a1 100644 --- a/src/ip/QosConfig.cc +++ b/src/ip/QosConfig.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #include "acl/Gadgets.h" #include "comm/Connection.h" diff --git a/src/ip/stubQosConfig.cc b/src/ip/stubQosConfig.cc index 2bb4dbdf68..559c4358be 100644 --- a/src/ip/stubQosConfig.cc +++ b/src/ip/stubQosConfig.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #include "ip/QosConfig.h" #include "Store.h" diff --git a/src/ip/testAddress.cc b/src/ip/testAddress.cc index 180a0c2df4..c69ab8f7cb 100644 --- a/src/ip/testAddress.cc +++ b/src/ip/testAddress.cc @@ -1,5 +1,5 @@ #define SQUID_UNIT_TEST 1 -#include "config.h" +#include "squid.h" //#include "compat/getaddrinfo.h" #include "testAddress.h" #include "ip/Address.h" diff --git a/src/ip/tools.cc b/src/ip/tools.cc index e930331e09..57d788ae37 100644 --- a/src/ip/tools.cc +++ b/src/ip/tools.cc @@ -30,7 +30,7 @@ * */ -#include "config.h" +#include "squid.h" #include "Debug.h" #include "ip/tools.h" diff --git a/src/ipc.cc b/src/ipc.cc index 4883131f15..eba613db64 100644 --- a/src/ipc.cc +++ b/src/ipc.cc @@ -30,7 +30,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "comm/Connection.h" #include "fde.h" #include "ip/Address.h" diff --git a/src/ipc/AtomicWord.cc b/src/ipc/AtomicWord.cc index 910b1a7c5f..2fdcc98ee5 100644 --- a/src/ipc/AtomicWord.cc +++ b/src/ipc/AtomicWord.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "ipc/AtomicWord.h" #include "protos.h" diff --git a/src/ipc/Coordinator.cc b/src/ipc/Coordinator.cc index cffbba9b8d..6f1a10a31f 100644 --- a/src/ipc/Coordinator.cc +++ b/src/ipc/Coordinator.cc @@ -6,7 +6,7 @@ */ -#include "config.h" +#include "squid.h" #include "base/Subscription.h" #include "base/TextException.h" #include "CacheManager.h" diff --git a/src/ipc/FdNotes.cc b/src/ipc/FdNotes.cc index f7ea3cf73f..e3c25d6685 100644 --- a/src/ipc/FdNotes.cc +++ b/src/ipc/FdNotes.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "Debug.h" #include "ipc/FdNotes.h" diff --git a/src/ipc/Forwarder.cc b/src/ipc/Forwarder.cc index b5ed2019f5..0f652a6f1a 100644 --- a/src/ipc/Forwarder.cc +++ b/src/ipc/Forwarder.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/AsyncJobCalls.h" #include "base/TextException.h" #include "errorpage.h" diff --git a/src/ipc/Inquirer.cc b/src/ipc/Inquirer.cc index 22c03a2d6a..5ff66a3803 100644 --- a/src/ipc/Inquirer.cc +++ b/src/ipc/Inquirer.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "comm.h" #include "comm/Write.h" diff --git a/src/ipc/Kid.cc b/src/ipc/Kid.cc index 1663e12ddc..5f436037a0 100644 --- a/src/ipc/Kid.cc +++ b/src/ipc/Kid.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "globals.h" #include "ipc/Kid.h" diff --git a/src/ipc/Kids.cc b/src/ipc/Kids.cc index 2423fca3c9..0747b564e1 100644 --- a/src/ipc/Kids.cc +++ b/src/ipc/Kids.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "ipc/Kids.h" #include "protos.h" diff --git a/src/ipc/Port.cc b/src/ipc/Port.cc index 710fde7bf4..29c3bc213b 100644 --- a/src/ipc/Port.cc +++ b/src/ipc/Port.cc @@ -6,7 +6,7 @@ */ -#include "config.h" +#include "squid.h" #include "comm.h" #include "CommCalls.h" #include "comm/Connection.h" diff --git a/src/ipc/Queue.cc b/src/ipc/Queue.cc index 6627aecb5d..c2dceb8735 100644 --- a/src/ipc/Queue.cc +++ b/src/ipc/Queue.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "Debug.h" #include "globals.h" diff --git a/src/ipc/ReadWriteLock.cc b/src/ipc/ReadWriteLock.cc index f319264f88..7fc164fb1a 100644 --- a/src/ipc/ReadWriteLock.cc +++ b/src/ipc/ReadWriteLock.cc @@ -4,7 +4,7 @@ * DEBUG: section 54 Interprocess Communication */ -#include "squid.h" +#include "squid-old.h" #include "Store.h" #include "ipc/ReadWriteLock.h" diff --git a/src/ipc/SharedListen.cc b/src/ipc/SharedListen.cc index e102aa1a41..8453f05a31 100644 --- a/src/ipc/SharedListen.cc +++ b/src/ipc/SharedListen.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include #include "comm.h" #include "base/TextException.h" diff --git a/src/ipc/StartListening.cc b/src/ipc/StartListening.cc index 299ffb54b9..c13cc0ac22 100644 --- a/src/ipc/StartListening.cc +++ b/src/ipc/StartListening.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "comm.h" #include "comm/Connection.h" diff --git a/src/ipc/StoreMap.cc b/src/ipc/StoreMap.cc index f91b522bd2..df5cc8c3d3 100644 --- a/src/ipc/StoreMap.cc +++ b/src/ipc/StoreMap.cc @@ -4,7 +4,7 @@ * DEBUG: section 54 Interprocess Communication */ -#include "squid.h" +#include "squid-old.h" #include "Store.h" #include "ipc/StoreMap.h" diff --git a/src/ipc/Strand.cc b/src/ipc/Strand.cc index 3b8a39c12a..53a690c1b4 100644 --- a/src/ipc/Strand.cc +++ b/src/ipc/Strand.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/Subscription.h" #include "base/TextException.h" #include "comm/Connection.h" diff --git a/src/ipc/StrandCoord.cc b/src/ipc/StrandCoord.cc index c10c4839db..50c41de75d 100644 --- a/src/ipc/StrandCoord.cc +++ b/src/ipc/StrandCoord.cc @@ -6,7 +6,7 @@ */ -#include "config.h" +#include "squid.h" #include "Debug.h" #include "ipc/Messages.h" #include "ipc/StrandCoord.h" diff --git a/src/ipc/StrandSearch.cc b/src/ipc/StrandSearch.cc index 5b281d92e7..b23fe37107 100644 --- a/src/ipc/StrandSearch.cc +++ b/src/ipc/StrandSearch.cc @@ -6,7 +6,7 @@ */ -#include "config.h" +#include "squid.h" #include "ipc/Messages.h" #include "ipc/StrandSearch.h" #include "ipc/TypedMsgHdr.h" diff --git a/src/ipc/TypedMsgHdr.cc b/src/ipc/TypedMsgHdr.cc index 2ccb0be8dd..bb653742cd 100644 --- a/src/ipc/TypedMsgHdr.cc +++ b/src/ipc/TypedMsgHdr.cc @@ -6,7 +6,7 @@ */ -#include "config.h" +#include "squid.h" #include #include "protos.h" #include "base/TextException.h" diff --git a/src/ipc/UdsOp.cc b/src/ipc/UdsOp.cc index 7230e37b34..12b03d0d4f 100644 --- a/src/ipc/UdsOp.cc +++ b/src/ipc/UdsOp.cc @@ -6,7 +6,7 @@ */ -#include "config.h" +#include "squid.h" #include "comm.h" #include "CommCalls.h" #include "comm/Connection.h" diff --git a/src/ipc/mem/Page.cc b/src/ipc/mem/Page.cc index e1fb96c88c..283dfcf8a8 100644 --- a/src/ipc/mem/Page.cc +++ b/src/ipc/mem/Page.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "ipc/mem/Page.h" #if HAVE_IOSTREAM diff --git a/src/ipc/mem/PagePool.cc b/src/ipc/mem/PagePool.cc index 187cc71206..532003cf97 100644 --- a/src/ipc/mem/PagePool.cc +++ b/src/ipc/mem/PagePool.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "ipc/mem/Page.h" #include "ipc/mem/PagePool.h" diff --git a/src/ipc/mem/PageStack.cc b/src/ipc/mem/PageStack.cc index 353ab90794..239d598dec 100644 --- a/src/ipc/mem/PageStack.cc +++ b/src/ipc/mem/PageStack.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "ipc/mem/Page.h" diff --git a/src/ipc/mem/Pages.cc b/src/ipc/mem/Pages.cc index c97487d2fe..27051f15e0 100644 --- a/src/ipc/mem/Pages.cc +++ b/src/ipc/mem/Pages.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "base/RunnersRegistry.h" #include "ipc/mem/PagePool.h" diff --git a/src/ipc/mem/Segment.cc b/src/ipc/mem/Segment.cc index b9cfa6b2f3..e5f5b5f8ce 100644 --- a/src/ipc/mem/Segment.cc +++ b/src/ipc/mem/Segment.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "compat/shm.h" #include "ipc/mem/Segment.h" diff --git a/src/ipc_win32.cc b/src/ipc_win32.cc index 9a72f01474..5b808d430a 100644 --- a/src/ipc_win32.cc +++ b/src/ipc_win32.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "comm.h" #include "fde.h" #include "ip/Address.h" diff --git a/src/ipcache.cc b/src/ipcache.cc index 30129c1cf7..19b0f31a4e 100644 --- a/src/ipcache.cc +++ b/src/ipcache.cc @@ -30,7 +30,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "cbdata.h" #include "CacheManager.h" #include "DnsLookupDetails.h" diff --git a/src/list.cc b/src/list.cc index ea5fb177a0..2d9d26eb49 100644 --- a/src/list.cc +++ b/src/list.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" /* This should go away, in favour of the List template class */ diff --git a/src/log/Config.cc b/src/log/Config.cc index 02ba17f2d6..37dc7e5a5f 100644 --- a/src/log/Config.cc +++ b/src/log/Config.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "log/Config.h" #include "protos.h" diff --git a/src/log/File.cc b/src/log/File.cc index b45aeacd62..dfd05cdaf3 100644 --- a/src/log/File.cc +++ b/src/log/File.cc @@ -32,7 +32,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "fde.h" #include "log/File.h" #include "log/ModDaemon.h" diff --git a/src/log/FormatHttpdCombined.cc b/src/log/FormatHttpdCombined.cc index 50fb3d646a..573c82bcb9 100644 --- a/src/log/FormatHttpdCombined.cc +++ b/src/log/FormatHttpdCombined.cc @@ -32,7 +32,7 @@ * */ -#include "config.h" +#include "squid.h" #include "AccessLogEntry.h" #include "format/Token.h" #include "format/Quoting.h" diff --git a/src/log/FormatHttpdCommon.cc b/src/log/FormatHttpdCommon.cc index d5c16fc903..82a0a03015 100644 --- a/src/log/FormatHttpdCommon.cc +++ b/src/log/FormatHttpdCommon.cc @@ -32,7 +32,7 @@ * */ -#include "config.h" +#include "squid.h" #include "AccessLogEntry.h" #include "format/Quoting.h" #include "format/Token.h" diff --git a/src/log/FormatSquidCustom.cc b/src/log/FormatSquidCustom.cc index 1a94b5170b..6cf2427d33 100644 --- a/src/log/FormatSquidCustom.cc +++ b/src/log/FormatSquidCustom.cc @@ -32,7 +32,7 @@ * */ -#include "config.h" +#include "squid.h" #include "AccessLogEntry.h" #include "log/File.h" #include "log/Formats.h" diff --git a/src/log/FormatSquidIcap.cc b/src/log/FormatSquidIcap.cc index e40f987e67..72a98c7b51 100644 --- a/src/log/FormatSquidIcap.cc +++ b/src/log/FormatSquidIcap.cc @@ -32,7 +32,7 @@ * */ -#include "config.h" +#include "squid.h" #if ICAP_CLIENT diff --git a/src/log/FormatSquidNative.cc b/src/log/FormatSquidNative.cc index 21ed037148..b3eb1c1af3 100644 --- a/src/log/FormatSquidNative.cc +++ b/src/log/FormatSquidNative.cc @@ -32,7 +32,7 @@ * */ -#include "config.h" +#include "squid.h" #include "AccessLogEntry.h" #include "format/Quoting.h" #include "format/Token.h" diff --git a/src/log/FormatSquidReferer.cc b/src/log/FormatSquidReferer.cc index 6932b9cdbb..16f8b3d17b 100644 --- a/src/log/FormatSquidReferer.cc +++ b/src/log/FormatSquidReferer.cc @@ -33,7 +33,7 @@ * */ -#include "config.h" +#include "squid.h" #include "AccessLogEntry.h" #include "HttpRequest.h" #include "log/File.h" diff --git a/src/log/FormatSquidUseragent.cc b/src/log/FormatSquidUseragent.cc index dc1ae23a5b..9eb825006f 100644 --- a/src/log/FormatSquidUseragent.cc +++ b/src/log/FormatSquidUseragent.cc @@ -33,7 +33,7 @@ * */ -#include "config.h" +#include "squid.h" #include "AccessLogEntry.h" #include "HttpRequest.h" #include "log/File.h" diff --git a/src/log/ModDaemon.cc b/src/log/ModDaemon.cc index 59bf69b761..3e7979200f 100644 --- a/src/log/ModDaemon.cc +++ b/src/log/ModDaemon.cc @@ -30,7 +30,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "cbdata.h" #include "comm/Loops.h" #include "fde.h" diff --git a/src/log/ModStdio.cc b/src/log/ModStdio.cc index 05d09a1a9d..efd7a4b061 100644 --- a/src/log/ModStdio.cc +++ b/src/log/ModStdio.cc @@ -30,7 +30,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "fde.h" #include "log/File.h" #include "log/ModStdio.h" diff --git a/src/log/ModSyslog.cc b/src/log/ModSyslog.cc index c79d9dc7a5..fa7e6dc0b5 100644 --- a/src/log/ModSyslog.cc +++ b/src/log/ModSyslog.cc @@ -30,7 +30,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #if HAVE_SYSLOG diff --git a/src/log/ModTcp.cc b/src/log/ModTcp.cc index 03c8c751d0..49a820b257 100644 --- a/src/log/ModTcp.cc +++ b/src/log/ModTcp.cc @@ -31,7 +31,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "comm.h" #include "comm/Connection.h" #include "log/File.h" diff --git a/src/log/ModUdp.cc b/src/log/ModUdp.cc index 1e22538348..800bc307a9 100644 --- a/src/log/ModUdp.cc +++ b/src/log/ModUdp.cc @@ -30,7 +30,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "comm.h" #include "comm/Connection.h" #include "log/File.h" diff --git a/src/log/access_log.cc b/src/log/access_log.cc index f36e865282..88265626fa 100644 --- a/src/log/access_log.cc +++ b/src/log/access_log.cc @@ -33,7 +33,7 @@ */ -#include "squid.h" +#include "squid-old.h" #include "AccessLogEntry.h" // Store.h Required by configuration directives parsing/dumping only diff --git a/src/main.cc b/src/main.cc index cb58e09710..b4a3c5df6e 100644 --- a/src/main.cc +++ b/src/main.cc @@ -32,7 +32,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "AccessLogEntry.h" #if USE_ADAPTATION #include "adaptation/Config.h" diff --git a/src/mem.cc b/src/mem.cc index 0f176efc65..4cdc9ddb61 100644 --- a/src/mem.cc +++ b/src/mem.cc @@ -32,7 +32,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "event.h" #include "mgr/Registration.h" #include "ClientInfo.h" diff --git a/src/mem_node.cc b/src/mem_node.cc index 6c4578d5a5..afac91e752 100644 --- a/src/mem_node.cc +++ b/src/mem_node.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "mem_node.h" static ptrdiff_t makeMemNodeDataOffset(); diff --git a/src/mgr/Action.cc b/src/mgr/Action.cc index 83f4cd0adb..c5d13e4571 100644 --- a/src/mgr/Action.cc +++ b/src/mgr/Action.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "comm/Connection.h" #include "HttpReply.h" #include "ipc/Port.h" diff --git a/src/mgr/ActionParams.cc b/src/mgr/ActionParams.cc index e4c5746820..1f47c275b3 100644 --- a/src/mgr/ActionParams.cc +++ b/src/mgr/ActionParams.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "ipc/TypedMsgHdr.h" #include "mgr/ActionParams.h" diff --git a/src/mgr/ActionWriter.cc b/src/mgr/ActionWriter.cc index 739471cadc..3ad3d0f506 100644 --- a/src/mgr/ActionWriter.cc +++ b/src/mgr/ActionWriter.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "comm/Connection.h" #include "mgr/ActionWriter.h" diff --git a/src/mgr/BasicActions.cc b/src/mgr/BasicActions.cc index 1d0a8909a8..7ed43318f6 100644 --- a/src/mgr/BasicActions.cc +++ b/src/mgr/BasicActions.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "CacheManager.h" #include "mgr/ActionCreator.h" diff --git a/src/mgr/Command.cc b/src/mgr/Command.cc index 2d57b2dba0..4be01e2b02 100644 --- a/src/mgr/Command.cc +++ b/src/mgr/Command.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "mgr/ActionProfile.h" #include "mgr/Command.h" diff --git a/src/mgr/CountersAction.cc b/src/mgr/CountersAction.cc index e65eee760b..f9fa61e0ba 100644 --- a/src/mgr/CountersAction.cc +++ b/src/mgr/CountersAction.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "ipc/Messages.h" #include "ipc/TypedMsgHdr.h" diff --git a/src/mgr/Filler.cc b/src/mgr/Filler.cc index 83adae6175..a43caf5752 100644 --- a/src/mgr/Filler.cc +++ b/src/mgr/Filler.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "comm/Connection.h" #include "mgr/Filler.h" diff --git a/src/mgr/Forwarder.cc b/src/mgr/Forwarder.cc index 8c384725de..9d6f2170a2 100644 --- a/src/mgr/Forwarder.cc +++ b/src/mgr/Forwarder.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/AsyncJobCalls.h" #include "base/TextException.h" #include "CommCalls.h" diff --git a/src/mgr/FunAction.cc b/src/mgr/FunAction.cc index 7df8a8a6b2..c2823acb10 100644 --- a/src/mgr/FunAction.cc +++ b/src/mgr/FunAction.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "comm/Connection.h" #include "ipc/UdsOp.h" diff --git a/src/mgr/InfoAction.cc b/src/mgr/InfoAction.cc index 3e7c3412ac..bd1028e18f 100644 --- a/src/mgr/InfoAction.cc +++ b/src/mgr/InfoAction.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "comm/Connection.h" #include "HttpReply.h" diff --git a/src/mgr/Inquirer.cc b/src/mgr/Inquirer.cc index c55b1dbae4..294c0045c5 100644 --- a/src/mgr/Inquirer.cc +++ b/src/mgr/Inquirer.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "comm/Connection.h" #include "comm/Write.h" diff --git a/src/mgr/IntParam.cc b/src/mgr/IntParam.cc index 70418aa791..c2f77b1288 100644 --- a/src/mgr/IntParam.cc +++ b/src/mgr/IntParam.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "ipc/TypedMsgHdr.h" #include "mgr/IntParam.h" diff --git a/src/mgr/IntervalAction.cc b/src/mgr/IntervalAction.cc index 1186b38ff5..e6d67b843b 100644 --- a/src/mgr/IntervalAction.cc +++ b/src/mgr/IntervalAction.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "ipc/Messages.h" #include "ipc/TypedMsgHdr.h" diff --git a/src/mgr/IoAction.cc b/src/mgr/IoAction.cc index 4e60968827..a6fc39ddb7 100644 --- a/src/mgr/IoAction.cc +++ b/src/mgr/IoAction.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "ipc/Messages.h" #include "ipc/TypedMsgHdr.h" diff --git a/src/mgr/QueryParams.cc b/src/mgr/QueryParams.cc index fc1e165f2b..4d71b10338 100644 --- a/src/mgr/QueryParams.cc +++ b/src/mgr/QueryParams.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "ipc/TypedMsgHdr.h" #include "mgr/IntParam.h" diff --git a/src/mgr/Registration.cc b/src/mgr/Registration.cc index 7e7491072c..7c5a68d6cf 100644 --- a/src/mgr/Registration.cc +++ b/src/mgr/Registration.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "CacheManager.h" #include "mgr/Registration.h" diff --git a/src/mgr/Request.cc b/src/mgr/Request.cc index bf99adf361..79f8235e0d 100644 --- a/src/mgr/Request.cc +++ b/src/mgr/Request.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "comm/Connection.h" #include "ipc/Messages.h" diff --git a/src/mgr/Response.cc b/src/mgr/Response.cc index 38d48865b1..ab79b475db 100644 --- a/src/mgr/Response.cc +++ b/src/mgr/Response.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "CacheManager.h" #include "ipc/Messages.h" diff --git a/src/mgr/ServiceTimesAction.cc b/src/mgr/ServiceTimesAction.cc index b02681b9b4..fe4f54cbf4 100644 --- a/src/mgr/ServiceTimesAction.cc +++ b/src/mgr/ServiceTimesAction.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "ipc/Messages.h" #include "ipc/TypedMsgHdr.h" diff --git a/src/mgr/StoreIoAction.cc b/src/mgr/StoreIoAction.cc index 8eb056fea7..2365974aa1 100644 --- a/src/mgr/StoreIoAction.cc +++ b/src/mgr/StoreIoAction.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "ipc/Messages.h" #include "ipc/TypedMsgHdr.h" diff --git a/src/mgr/StoreToCommWriter.cc b/src/mgr/StoreToCommWriter.cc index ce579052fc..5764ec7e53 100644 --- a/src/mgr/StoreToCommWriter.cc +++ b/src/mgr/StoreToCommWriter.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "comm/Connection.h" #include "CommCalls.h" diff --git a/src/mgr/StringParam.cc b/src/mgr/StringParam.cc index 358b0ea022..8d0f7a2eca 100644 --- a/src/mgr/StringParam.cc +++ b/src/mgr/StringParam.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "ipc/TypedMsgHdr.h" #include "mgr/StringParam.h" diff --git a/src/mgr/stub_libmgr.cc b/src/mgr/stub_libmgr.cc index d5b0af09aa..b03e96ee62 100644 --- a/src/mgr/stub_libmgr.cc +++ b/src/mgr/stub_libmgr.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #define STUB_API "lmgr/libmgr.la" #include "tests/STUB.h" diff --git a/src/mime.cc b/src/mime.cc index 7c7af825c4..704a5fb00c 100644 --- a/src/mime.cc +++ b/src/mime.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "HttpHdrCc.h" #include "Store.h" #include "StoreClient.h" diff --git a/src/mime_header.cc b/src/mime_header.cc index 02decf9c1a..e0a3fbd818 100644 --- a/src/mime_header.cc +++ b/src/mime_header.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #define GET_HDR_SZ 1024 diff --git a/src/mk-string-arrays.awk b/src/mk-string-arrays.awk index be0ebadf3a..f199733424 100644 --- a/src/mk-string-arrays.awk +++ b/src/mk-string-arrays.awk @@ -14,7 +14,7 @@ BEGIN { print "/*" print " * Auto-Generated File. Changes will be destroyed." print " */" - print "#include \"config.h\"" + print "#include \"squid.h\"" codeSkip = 1 e = 0 nspath = "" diff --git a/src/multicast.cc b/src/multicast.cc index 0d999fe728..59712bfd1f 100644 --- a/src/multicast.cc +++ b/src/multicast.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "comm/Connection.h" // XXX: for icpIncomingConn - need to pass it as a generic parameter. #include "ICP.h" diff --git a/src/neighbors.cc b/src/neighbors.cc index 2a1c24ea27..023fcda89a 100644 --- a/src/neighbors.cc +++ b/src/neighbors.cc @@ -30,7 +30,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "ProtoPort.h" #include "acl/FilledChecklist.h" #include "comm/Connection.h" diff --git a/src/pconn.cc b/src/pconn.cc index 4f75424b6e..29b84b9c80 100644 --- a/src/pconn.cc +++ b/src/pconn.cc @@ -32,7 +32,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "comm/Connection.h" #include "mgr/Registration.h" #include "Store.h" diff --git a/src/peer_digest.cc b/src/peer_digest.cc index 3ddf4df286..973a1af4b6 100644 --- a/src/peer_digest.cc +++ b/src/peer_digest.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #if USE_CACHE_DIGESTS #include "event.h" diff --git a/src/peer_proxy_negotiate_auth.cc b/src/peer_proxy_negotiate_auth.cc index 1d5ada7acd..e05db06ac5 100644 --- a/src/peer_proxy_negotiate_auth.cc +++ b/src/peer_proxy_negotiate_auth.cc @@ -25,7 +25,7 @@ * Hosted at http://sourceforge.net/projects/squidkerbauth */ -#include "config.h" +#include "squid.h" #include "base64.h" #include "Debug.h" diff --git a/src/peer_select.cc b/src/peer_select.cc index c822b9db65..71a76a472a 100644 --- a/src/peer_select.cc +++ b/src/peer_select.cc @@ -32,7 +32,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "DnsLookupDetails.h" #include "errorpage.h" #include "event.h" diff --git a/src/peer_sourcehash.cc b/src/peer_sourcehash.cc index f353975bd2..cb4b8752a1 100644 --- a/src/peer_sourcehash.cc +++ b/src/peer_sourcehash.cc @@ -34,7 +34,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "Store.h" #include "HttpRequest.h" #include "mgr/Registration.h" diff --git a/src/peer_userhash.cc b/src/peer_userhash.cc index 53584c53d9..0012a95610 100644 --- a/src/peer_userhash.cc +++ b/src/peer_userhash.cc @@ -34,7 +34,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #if USE_AUTH diff --git a/src/recv-announce.cc b/src/recv-announce.cc index f75e3fc0ee..2a269dd69e 100644 --- a/src/recv-announce.cc +++ b/src/recv-announce.cc @@ -31,7 +31,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * */ -#include "config.h" +#include "squid.h" #include #include diff --git a/src/redirect.cc b/src/redirect.cc index 7cb6bdeccb..a6d450e346 100644 --- a/src/redirect.cc +++ b/src/redirect.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #if USE_AUTH #include "auth/UserRequest.h" #endif diff --git a/src/refresh.cc b/src/refresh.cc index 9049aa1335..da8d3eb9a5 100644 --- a/src/refresh.cc +++ b/src/refresh.cc @@ -37,7 +37,7 @@ #define USE_POSIX_REGEX /* put before includes; always use POSIX */ #endif -#include "squid.h" +#include "squid-old.h" #include "HttpHdrCc.h" #include "mgr/Registration.h" #include "Store.h" diff --git a/src/repl/heap/store_heap_replacement.cc b/src/repl/heap/store_heap_replacement.cc index 8ecd07fadb..68ee1b938c 100644 --- a/src/repl/heap/store_heap_replacement.cc +++ b/src/repl/heap/store_heap_replacement.cc @@ -41,7 +41,7 @@ * http://www.hpl.hp.com/techreports/1999/HPL-1999-69.html */ -#include "squid.h" +#include "squid-old.h" #include "heap.h" #include "store_heap_replacement.h" #include "Store.h" diff --git a/src/repl/heap/store_repl_heap.cc b/src/repl/heap/store_repl_heap.cc index 5cf1809c63..0121e0fcd3 100644 --- a/src/repl/heap/store_repl_heap.cc +++ b/src/repl/heap/store_repl_heap.cc @@ -41,7 +41,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "heap.h" #include "store_heap_replacement.h" #include "Store.h" diff --git a/src/repl/lru/store_repl_lru.cc b/src/repl/lru/store_repl_lru.cc index 893a5a6059..f276b65296 100644 --- a/src/repl/lru/store_repl_lru.cc +++ b/src/repl/lru/store_repl_lru.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "Store.h" #include "MemObject.h" #include "SquidTime.h" diff --git a/src/send-announce.cc b/src/send-announce.cc index 03ea3e5624..79d80b9f90 100644 --- a/src/send-announce.cc +++ b/src/send-announce.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "comm/Connection.h" #include "event.h" #include "fde.h" diff --git a/src/snmp/Forwarder.cc b/src/snmp/Forwarder.cc index 87b0aea5b0..8f63020b50 100644 --- a/src/snmp/Forwarder.cc +++ b/src/snmp/Forwarder.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "CommCalls.h" #include "comm.h" diff --git a/src/snmp/Inquirer.cc b/src/snmp/Inquirer.cc index 4f19e60c1b..2d2a992bc0 100644 --- a/src/snmp/Inquirer.cc +++ b/src/snmp/Inquirer.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "CommCalls.h" #include "comm.h" diff --git a/src/snmp/Pdu.cc b/src/snmp/Pdu.cc index eb3d12ff90..73fbe4bf47 100644 --- a/src/snmp/Pdu.cc +++ b/src/snmp/Pdu.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "ipc/TypedMsgHdr.h" #include "protos.h" diff --git a/src/snmp/Request.cc b/src/snmp/Request.cc index b204f8c2e9..4081b77fe8 100644 --- a/src/snmp/Request.cc +++ b/src/snmp/Request.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "ipc/Messages.h" #include "ipc/TypedMsgHdr.h" #include "snmp/Request.h" diff --git a/src/snmp/Response.cc b/src/snmp/Response.cc index 0128f16a87..2ec5374ae4 100644 --- a/src/snmp/Response.cc +++ b/src/snmp/Response.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "ipc/Messages.h" #include "ipc/TypedMsgHdr.h" diff --git a/src/snmp/Session.cc b/src/snmp/Session.cc index 566ec96d62..155e0eb58f 100644 --- a/src/snmp/Session.cc +++ b/src/snmp/Session.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "ipc/TypedMsgHdr.h" #include "protos.h" diff --git a/src/snmp/Var.cc b/src/snmp/Var.cc index a3ad52ce65..f05e6220ac 100644 --- a/src/snmp/Var.cc +++ b/src/snmp/Var.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base/TextException.h" #include "ipc/TypedMsgHdr.h" #include "protos.h" diff --git a/src/snmp_agent.cc b/src/snmp_agent.cc index 0905d7b4b3..e220c7871f 100644 --- a/src/snmp_agent.cc +++ b/src/snmp_agent.cc @@ -32,7 +32,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "cache_snmp.h" #include "Store.h" #include "mem_node.h" diff --git a/src/snmp_core.cc b/src/snmp_core.cc index 729c0d1bca..87b6dc0308 100644 --- a/src/snmp_core.cc +++ b/src/snmp_core.cc @@ -29,7 +29,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * */ -#include "squid.h" +#include "squid-old.h" #include "acl/FilledChecklist.h" #include "base/CbcPointer.h" #include "comm.h" diff --git a/src/squid.h b/src/squid-old.h similarity index 99% rename from src/squid.h rename to src/squid-old.h index c1f4560432..a5ccf4953e 100644 --- a/src/squid.h +++ b/src/squid-old.h @@ -32,7 +32,7 @@ #ifndef SQUID_H #define SQUID_H -#include "config.h" +#include "squid.h" #if _SQUID_MSWIN_ /** \cond AUTODOCS-IGNORE */ diff --git a/src/ssl/Config.cc b/src/ssl/Config.cc index 301c6ebf85..6fee7bee2a 100644 --- a/src/ssl/Config.cc +++ b/src/ssl/Config.cc @@ -1,7 +1,7 @@ /* * $Id$ */ -#include "config.h" +#include "squid.h" #include "ssl/Config.h" Ssl::Config Ssl::TheConfig; diff --git a/src/ssl/ErrorDetail.cc b/src/ssl/ErrorDetail.cc index 8c2c2f8430..4029abffd1 100644 --- a/src/ssl/ErrorDetail.cc +++ b/src/ssl/ErrorDetail.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #include "errorpage.h" #include "ssl/ErrorDetail.h" #if HAVE_MAP diff --git a/src/ssl/ErrorDetailManager.cc b/src/ssl/ErrorDetailManager.cc index 4bfe6e5e62..76ddc1a7d6 100644 --- a/src/ssl/ErrorDetailManager.cc +++ b/src/ssl/ErrorDetailManager.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #include "ErrorDetail.h" #include "errorpage.h" #include "ErrorDetailManager.h" diff --git a/src/ssl/certificate_db.cc b/src/ssl/certificate_db.cc index c2237f1874..0f15494d02 100644 --- a/src/ssl/certificate_db.cc +++ b/src/ssl/certificate_db.cc @@ -2,7 +2,7 @@ * $Id$ */ -#include "config.h" +#include "squid.h" #include "ssl/certificate_db.h" #if HAVE_ERRNO_H #include diff --git a/src/ssl/context_storage.cc b/src/ssl/context_storage.cc index bc02b47cf5..d5ec656af7 100644 --- a/src/ssl/context_storage.cc +++ b/src/ssl/context_storage.cc @@ -1,7 +1,7 @@ /* * $Id$ */ -#include "config.h" +#include "squid.h" #include "Store.h" #include "StoreEntryStream.h" #include "ssl/context_storage.h" diff --git a/src/ssl/crtd_message.cc b/src/ssl/crtd_message.cc index 1ade0a7cea..de4f70df15 100644 --- a/src/ssl/crtd_message.cc +++ b/src/ssl/crtd_message.cc @@ -2,7 +2,7 @@ * $Id$ */ -#include "config.h" +#include "squid.h" #include "ssl/crtd_message.h" #if HAVE_CSTDLIB #include diff --git a/src/ssl/gadgets.cc b/src/ssl/gadgets.cc index c1263e78b0..5b7709a32b 100644 --- a/src/ssl/gadgets.cc +++ b/src/ssl/gadgets.cc @@ -2,7 +2,7 @@ * $Id$ */ -#include "config.h" +#include "squid.h" #include "ssl/gadgets.h" #if HAVE_OPENSSL_X509V3_H #include diff --git a/src/ssl/helper.cc b/src/ssl/helper.cc index b6e16e9fea..8f4f2f0ced 100644 --- a/src/ssl/helper.cc +++ b/src/ssl/helper.cc @@ -2,7 +2,7 @@ * 2008/11/14 */ -#include "config.h" +#include "squid.h" #include "ProtoPort.h" #include "ssl/Config.h" #include "ssl/helper.h" diff --git a/src/ssl/ssl_crtd.cc b/src/ssl/ssl_crtd.cc index 354d62ef99..b39d34c74b 100644 --- a/src/ssl/ssl_crtd.cc +++ b/src/ssl/ssl_crtd.cc @@ -2,7 +2,7 @@ * $Id$ */ -#include "config.h" +#include "squid.h" #include "helpers/defines.h" #include "ssl/gadgets.h" #include "ssl/crtd_message.h" diff --git a/src/ssl/stub_libsslsquid.cc b/src/ssl/stub_libsslsquid.cc index 8c15b88905..cf87011912 100644 --- a/src/ssl/stub_libsslsquid.cc +++ b/src/ssl/stub_libsslsquid.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "fatal.h" /* Stub File for the ssl/libsslsquid.la convenience library */ diff --git a/src/ssl/stub_libsslutil.cc b/src/ssl/stub_libsslutil.cc index 5ecf4af91c..384c000550 100644 --- a/src/ssl/stub_libsslutil.cc +++ b/src/ssl/stub_libsslutil.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "fatal.h" /* Stub File for the ssl/libsslutil.la convenience library */ diff --git a/src/ssl/support.cc b/src/ssl/support.cc index 03dd48b883..9e047a945d 100644 --- a/src/ssl/support.cc +++ b/src/ssl/support.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" /* MS Visual Studio Projects are monolithic, so we need the following * #if to exclude the SSL code from compile process when not needed. diff --git a/src/stat.cc b/src/stat.cc index e8d489f76f..22750b465d 100644 --- a/src/stat.cc +++ b/src/stat.cc @@ -32,7 +32,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "event.h" #include "format/Token.h" #include "StoreClient.h" diff --git a/src/stmem.cc b/src/stmem.cc index 719ea1d7dd..716c3097fa 100644 --- a/src/stmem.cc +++ b/src/stmem.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "stmem.h" #include "mem_node.h" #include "MemObject.h" diff --git a/src/store.cc b/src/store.cc index 7198db54f0..1c9a9e18a0 100644 --- a/src/store.cc +++ b/src/store.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "CacheManager.h" #include "comm/Connection.h" #include "ETag.h" diff --git a/src/store_client.cc b/src/store_client.cc index fd8003b3e5..8e022d8093 100644 --- a/src/store_client.cc +++ b/src/store_client.cc @@ -34,7 +34,7 @@ * Portions copyright (c) 2003 Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "event.h" #include "StoreClient.h" #include "Store.h" diff --git a/src/store_digest.cc b/src/store_digest.cc index 14649ab5f1..1172f8a54a 100644 --- a/src/store_digest.cc +++ b/src/store_digest.cc @@ -40,7 +40,7 @@ * storeDigestRebuild/write schedule to be activated */ -#include "squid.h" +#include "squid-old.h" #include "event.h" #include "mgr/Registration.h" #if USE_CACHE_DIGESTS diff --git a/src/store_dir.cc b/src/store_dir.cc index 33feeb8e28..5303ce3864 100644 --- a/src/store_dir.cc +++ b/src/store_dir.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "Store.h" #include "MemObject.h" #include "MemStore.h" diff --git a/src/store_io.cc b/src/store_io.cc index aca973ed82..8d87a2993f 100644 --- a/src/store_io.cc +++ b/src/store_io.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #include "Store.h" #include "MemObject.h" #include "SwapDir.h" diff --git a/src/store_key_md5.cc b/src/store_key_md5.cc index 06f1377a4a..300b766646 100644 --- a/src/store_key_md5.cc +++ b/src/store_key_md5.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "HttpRequest.h" static cache_key null_key[SQUID_MD5_DIGEST_LENGTH]; diff --git a/src/store_log.cc b/src/store_log.cc index ddbce3be7e..928512f9b4 100644 --- a/src/store_log.cc +++ b/src/store_log.cc @@ -32,7 +32,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "format/Token.h" #include "HttpReply.h" #include "log/File.h" diff --git a/src/store_rebuild.cc b/src/store_rebuild.cc index fe88871132..521cf26b68 100644 --- a/src/store_rebuild.cc +++ b/src/store_rebuild.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "event.h" #include "StatCounters.h" #include "Store.h" diff --git a/src/store_swapin.cc b/src/store_swapin.cc index 6d9d105a1e..d7b81875a2 100644 --- a/src/store_swapin.cc +++ b/src/store_swapin.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "StatCounters.h" #include "StoreClient.h" #include "Store.h" diff --git a/src/store_swapmeta.cc b/src/store_swapmeta.cc index 3a0086e00e..79e1e0aa1c 100644 --- a/src/store_swapmeta.cc +++ b/src/store_swapmeta.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "Store.h" #include "MemObject.h" #include "StoreMeta.h" diff --git a/src/store_swapout.cc b/src/store_swapout.cc index 36063095d3..7e896c5ca0 100644 --- a/src/store_swapout.cc +++ b/src/store_swapout.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "cbdata.h" #include "StoreClient.h" #include "Store.h" diff --git a/src/test_cache_digest.cc b/src/test_cache_digest.cc index 30ae1dbf09..3498eedcef 100644 --- a/src/test_cache_digest.cc +++ b/src/test_cache_digest.cc @@ -36,7 +36,7 @@ * Test-suite for playing with cache digests */ -#include "squid.h" +#include "squid-old.h" typedef struct { int query_count; diff --git a/src/tests/TestSwapDir.cc b/src/tests/TestSwapDir.cc index b650b646ce..19cc0e8786 100644 --- a/src/tests/TestSwapDir.cc +++ b/src/tests/TestSwapDir.cc @@ -1,6 +1,6 @@ -#include "config.h" - #include "squid.h" + +#include "squid-old.h" #include "TestSwapDir.h" uint64_t diff --git a/src/tests/TestSwapDir.h b/src/tests/TestSwapDir.h index ad6f81d63e..5785249c2e 100644 --- a/src/tests/TestSwapDir.h +++ b/src/tests/TestSwapDir.h @@ -1,7 +1,7 @@ #ifndef TEST_TESTSWAPDIR #define TEST_TESTSWAPDIR -#include "squid.h" +#include "squid-old.h" #include "SwapDir.h" class TestSwapDir : public SwapDir diff --git a/src/tests/stub_CommIO.cc b/src/tests/stub_CommIO.cc index ca46e9a5f8..95347359e5 100644 --- a/src/tests/stub_CommIO.cc +++ b/src/tests/stub_CommIO.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #include "CommIO.h" #define STUB_API "CommIO.cc" diff --git a/src/tests/stub_DelayId.cc b/src/tests/stub_DelayId.cc index c2d926efb1..2828531bdf 100644 --- a/src/tests/stub_DelayId.cc +++ b/src/tests/stub_DelayId.cc @@ -32,10 +32,10 @@ * */ -#include "config.h" +#include "squid.h" #if USE_DELAY_POOLS -#include "squid.h" +#include "squid-old.h" #include "DelayId.h" DelayId::DelayId() {} diff --git a/src/tests/stub_DiskIOModule.cc b/src/tests/stub_DiskIOModule.cc index 74c8a60a42..457726bc7b 100644 --- a/src/tests/stub_DiskIOModule.cc +++ b/src/tests/stub_DiskIOModule.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #define STUB_API "DiskIOModule.cc" #include "tests/STUB.h" diff --git a/src/tests/stub_HelperChildConfig.cc b/src/tests/stub_HelperChildConfig.cc index 23538ce384..0fede5afad 100644 --- a/src/tests/stub_HelperChildConfig.cc +++ b/src/tests/stub_HelperChildConfig.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "HelperChildConfig.h" #include "globals.h" diff --git a/src/tests/stub_HttpReply.cc b/src/tests/stub_HttpReply.cc index 30e7bc67dd..c6a12b21bc 100644 --- a/src/tests/stub_HttpReply.cc +++ b/src/tests/stub_HttpReply.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "HttpReply.h" #define STUB_API "HttpReply.cc" diff --git a/src/tests/stub_HttpRequest.cc b/src/tests/stub_HttpRequest.cc index a18602706f..4b053d1ff5 100644 --- a/src/tests/stub_HttpRequest.cc +++ b/src/tests/stub_HttpRequest.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "HttpRequest.h" #define STUB_API "HttpRequest.cc" diff --git a/src/tests/stub_MemObject.cc b/src/tests/stub_MemObject.cc index 5a99d8c2d0..7d2600bf70 100644 --- a/src/tests/stub_MemObject.cc +++ b/src/tests/stub_MemObject.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "comm/Connection.h" #include "MemObject.h" #include "HttpReply.h" diff --git a/src/tests/stub_MemStore.cc b/src/tests/stub_MemStore.cc index de357af194..206dbe4bf3 100644 --- a/src/tests/stub_MemStore.cc +++ b/src/tests/stub_MemStore.cc @@ -5,7 +5,7 @@ * */ -#include "config.h" +#include "squid.h" #include "MemStore.h" #define STUB_API "MemStore.cc" diff --git a/src/tests/stub_Port.cc b/src/tests/stub_Port.cc index 1d7f2f9b3f..5c12a54ead 100644 --- a/src/tests/stub_Port.cc +++ b/src/tests/stub_Port.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "ipc/Port.h" #define STUB_API "ipc/Port.cc" diff --git a/src/tests/stub_StatHist.cc b/src/tests/stub_StatHist.cc index dd48a0bcfb..cf0cfdfd4e 100644 --- a/src/tests/stub_StatHist.cc +++ b/src/tests/stub_StatHist.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #define STUB_API "StatHist.cc" #include "STUB.h" #include "StatHist.h" diff --git a/src/tests/stub_UdsOp.cc b/src/tests/stub_UdsOp.cc index f78dc820cb..4845787a4e 100644 --- a/src/tests/stub_UdsOp.cc +++ b/src/tests/stub_UdsOp.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "ipc/UdsOp.h" #define STUB_API "UdsOp.cc" diff --git a/src/tests/stub_access_log.cc b/src/tests/stub_access_log.cc index 2c8afff80f..836a87a0d8 100644 --- a/src/tests/stub_access_log.cc +++ b/src/tests/stub_access_log.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #include "HierarchyLogEntry.h" #define STUB_API "access.log.cc" diff --git a/src/tests/stub_acl.cc b/src/tests/stub_acl.cc index 7b82af51e5..81421d2a0b 100644 --- a/src/tests/stub_acl.cc +++ b/src/tests/stub_acl.cc @@ -32,7 +32,7 @@ * */ -#include "squid.h" +#include "squid-old.h" /* * DO NOT MODIFY: diff --git a/src/tests/stub_cache_cf.cc b/src/tests/stub_cache_cf.cc index 31a91ca52c..69b092fa9d 100644 --- a/src/tests/stub_cache_cf.cc +++ b/src/tests/stub_cache_cf.cc @@ -32,7 +32,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "ConfigParser.h" #include "wordlist.h" diff --git a/src/tests/stub_cache_manager.cc b/src/tests/stub_cache_manager.cc index cf69d1869f..819182a4c2 100644 --- a/src/tests/stub_cache_manager.cc +++ b/src/tests/stub_cache_manager.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #include "CacheManager.h" #include "mgr/Registration.h" diff --git a/src/tests/stub_client_db.cc b/src/tests/stub_client_db.cc index 9425c9e2dd..072454bee4 100644 --- a/src/tests/stub_client_db.cc +++ b/src/tests/stub_client_db.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" /* because the clientdb API is defined in protos.h still */ #include "protos.h" diff --git a/src/tests/stub_client_side_request.cc b/src/tests/stub_client_side_request.cc index 7bf75c2b5a..e91b22fdf2 100644 --- a/src/tests/stub_client_side_request.cc +++ b/src/tests/stub_client_side_request.cc @@ -31,7 +31,7 @@ * */ -#include "config.h" +#include "squid.h" #include "client_side_request.h" #include "Store.h" diff --git a/src/tests/stub_comm.cc b/src/tests/stub_comm.cc index 5c4747f75e..272949ce39 100644 --- a/src/tests/stub_comm.cc +++ b/src/tests/stub_comm.cc @@ -32,7 +32,7 @@ * */ -#include "config.h" +#include "squid.h" #include "comm.h" #include "comm/Connection.h" #include "comm/Loops.h" diff --git a/src/tests/stub_debug.cc b/src/tests/stub_debug.cc index 556d3b4e00..5988bb7e1b 100644 --- a/src/tests/stub_debug.cc +++ b/src/tests/stub_debug.cc @@ -2,7 +2,7 @@ * A stub implementation of the Debug.h API. * For use by test binaries which do not need the full context debugging */ -#include "config.h" +#include "squid.h" #include "Debug.h" #if HAVE_STDIO_H diff --git a/src/tests/stub_errorpage.cc b/src/tests/stub_errorpage.cc index 831bdf3b16..99bb0bcfef 100644 --- a/src/tests/stub_errorpage.cc +++ b/src/tests/stub_errorpage.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "errorpage.h" #define STUB_API "errorpage.cc" diff --git a/src/tests/stub_event.cc b/src/tests/stub_event.cc index defa64dcd6..1bdb14a48f 100644 --- a/src/tests/stub_event.cc +++ b/src/tests/stub_event.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "event.h" #define STUB_API "event.cc" diff --git a/src/tests/stub_fd.cc b/src/tests/stub_fd.cc index 85e60a648c..afd90cb230 100644 --- a/src/tests/stub_fd.cc +++ b/src/tests/stub_fd.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "fde.h" #define STUB_API "fd.cc" diff --git a/src/tests/stub_helper.cc b/src/tests/stub_helper.cc index f2a8de5a1d..d178a0396b 100644 --- a/src/tests/stub_helper.cc +++ b/src/tests/stub_helper.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "helper.h" #define STUB_API "helper.cc" diff --git a/src/tests/stub_http.cc b/src/tests/stub_http.cc index af699054ba..e6d2302a57 100644 --- a/src/tests/stub_http.cc +++ b/src/tests/stub_http.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #define STUB_API "http.cc" #include "tests/STUB.h" diff --git a/src/tests/stub_icp.cc b/src/tests/stub_icp.cc index 0de7f81a96..04de5ff46b 100644 --- a/src/tests/stub_icp.cc +++ b/src/tests/stub_icp.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "comm/Connection.h" #include "ICP.h" #include "icp_opcode.h" diff --git a/src/tests/stub_internal.cc b/src/tests/stub_internal.cc index 45a9f3124d..f741956185 100644 --- a/src/tests/stub_internal.cc +++ b/src/tests/stub_internal.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "protos.h" #define STUB_API "internal.cc" diff --git a/src/tests/stub_ipc.cc b/src/tests/stub_ipc.cc index 1180582e93..8c5c2f0eed 100644 --- a/src/tests/stub_ipc.cc +++ b/src/tests/stub_ipc.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" // because ipcCreate is defined in protos.h still #include "protos.h" diff --git a/src/tests/stub_ipc_Forwarder.cc b/src/tests/stub_ipc_Forwarder.cc index 03234df0de..56770a2a00 100644 --- a/src/tests/stub_ipc_Forwarder.cc +++ b/src/tests/stub_ipc_Forwarder.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "ipc/Forwarder.h" //Avoid linker errors about Ipc::Forwarder diff --git a/src/tests/stub_ipc_TypedMsgHdr.cc b/src/tests/stub_ipc_TypedMsgHdr.cc index 0e00b7a8c0..a3366048c6 100644 --- a/src/tests/stub_ipc_TypedMsgHdr.cc +++ b/src/tests/stub_ipc_TypedMsgHdr.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #define STUB_API "TypedMsgHdr.cc" #include "tests/STUB.h" diff --git a/src/tests/stub_ipcache.cc b/src/tests/stub_ipcache.cc index 9ae91b2fb5..2c05d3a1e5 100644 --- a/src/tests/stub_ipcache.cc +++ b/src/tests/stub_ipcache.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "ipcache.h" #define STUB_API "ipcache.cc" diff --git a/src/tests/stub_libcomm.cc b/src/tests/stub_libcomm.cc index 653947b430..9759ed4a1c 100644 --- a/src/tests/stub_libcomm.cc +++ b/src/tests/stub_libcomm.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "base/AsyncJob.h" #include "structs.h" diff --git a/src/tests/stub_libicmp.cc b/src/tests/stub_libicmp.cc index a5adbce6dc..d5d539a174 100644 --- a/src/tests/stub_libicmp.cc +++ b/src/tests/stub_libicmp.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #define STUB_API "icmp/libicmp.la" #include "STUB.h" diff --git a/src/tests/stub_main_cc.cc b/src/tests/stub_main_cc.cc index 8a069a8d6a..39d3a6f676 100644 --- a/src/tests/stub_main_cc.cc +++ b/src/tests/stub_main_cc.cc @@ -33,7 +33,7 @@ * */ -#include "config.h" +#include "squid.h" void shut_down(int) diff --git a/src/tests/stub_mem.cc b/src/tests/stub_mem.cc index 97c1599305..53cc877b1f 100644 --- a/src/tests/stub_mem.cc +++ b/src/tests/stub_mem.cc @@ -2,7 +2,7 @@ * stub file for mem.cc */ -#include "config.h" +#include "squid.h" #define STUB_API "stub_mem.cc" #include "STUB.h" diff --git a/src/tests/stub_mem_node.cc b/src/tests/stub_mem_node.cc index 59ba00643f..b19720124f 100644 --- a/src/tests/stub_mem_node.cc +++ b/src/tests/stub_mem_node.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "mem_node.h" #define STUB_API "mem_node.cc" diff --git a/src/tests/stub_mime.cc b/src/tests/stub_mime.cc index d2be1f0af5..a7a8613084 100644 --- a/src/tests/stub_mime.cc +++ b/src/tests/stub_mime.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "protos.h" #define STUB_API "mime.cc" diff --git a/src/tests/stub_pconn.cc b/src/tests/stub_pconn.cc index 7446e10ad9..3a7fcd3d72 100644 --- a/src/tests/stub_pconn.cc +++ b/src/tests/stub_pconn.cc @@ -1,7 +1,7 @@ /* * STUB file for the pconn.cc API */ -#include "config.h" +#include "squid.h" #include "pconn.h" #include "comm/Connection.h" diff --git a/src/tests/stub_stat.cc b/src/tests/stub_stat.cc index 8e62c37d4b..b40e3f51bf 100644 --- a/src/tests/stub_stat.cc +++ b/src/tests/stub_stat.cc @@ -32,7 +32,7 @@ * */ -#include "squid.h" +#include "squid-old.h" /* * DO NOT MODIFY: diff --git a/src/tests/stub_stmem.cc b/src/tests/stub_stmem.cc index cee7152423..27046c3a75 100644 --- a/src/tests/stub_stmem.cc +++ b/src/tests/stub_stmem.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "stmem.h" #define STUB_API "stmem.cc" diff --git a/src/tests/stub_store.cc b/src/tests/stub_store.cc index b8732c73e7..98f674dff8 100644 --- a/src/tests/stub_store.cc +++ b/src/tests/stub_store.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #define STUB_API "store.cc" #include "tests/STUB.h" diff --git a/src/tests/stub_store_client.cc b/src/tests/stub_store_client.cc index c90f04277c..16e87d28c0 100644 --- a/src/tests/stub_store_client.cc +++ b/src/tests/stub_store_client.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #include "StoreClient.h" #include "Store.h" diff --git a/src/tests/stub_store_rebuild.cc b/src/tests/stub_store_rebuild.cc index 608cbddeb2..56cee08e00 100644 --- a/src/tests/stub_store_rebuild.cc +++ b/src/tests/stub_store_rebuild.cc @@ -32,7 +32,7 @@ * */ -#include "squid.h" +#include "squid-old.h" void storeRebuildProgress(int sd_index, int total, int sofar) diff --git a/src/tests/stub_store_stats.cc b/src/tests/stub_store_stats.cc index 9a43f8441d..ce975ba572 100644 --- a/src/tests/stub_store_stats.cc +++ b/src/tests/stub_store_stats.cc @@ -1,4 +1,4 @@ -#include "squid.h" +#include "squid-old.h" #define STUB_API "StoreStats.cc" #include "tests/STUB.h" diff --git a/src/tests/stub_store_swapout.cc b/src/tests/stub_store_swapout.cc index 78806fd615..6a77145ce5 100644 --- a/src/tests/stub_store_swapout.cc +++ b/src/tests/stub_store_swapout.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "StoreMeta.h" #define STUB_API "store_swapout.cc" diff --git a/src/tests/stub_tools.cc b/src/tests/stub_tools.cc index 6ff3b04875..422c95b2bd 100644 --- a/src/tests/stub_tools.cc +++ b/src/tests/stub_tools.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" // tool functions still defined in protos.h - TODO extract #include "protos.h" diff --git a/src/tests/stub_wordlist.cc b/src/tests/stub_wordlist.cc index 3ec920a685..3586c4136a 100644 --- a/src/tests/stub_wordlist.cc +++ b/src/tests/stub_wordlist.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "wordlist.h" #define STUB_API "wordlist.cc" diff --git a/src/tests/testACLMaxUserIP.cc b/src/tests/testACLMaxUserIP.cc index b7be6ec6c2..24b9693960 100644 --- a/src/tests/testACLMaxUserIP.cc +++ b/src/tests/testACLMaxUserIP.cc @@ -1,6 +1,6 @@ #define SQUID_UNIT_TEST 1 -#include "squid.h" +#include "squid-old.h" #if USE_AUTH diff --git a/src/tests/testAuth.cc b/src/tests/testAuth.cc index 091d56d96c..239cadf449 100644 --- a/src/tests/testAuth.cc +++ b/src/tests/testAuth.cc @@ -1,6 +1,6 @@ #define SQUID_UNIT_TEST 1 -#include "squid.h" +#include "squid-old.h" #if USE_AUTH diff --git a/src/tests/testBoilerplate.cc b/src/tests/testBoilerplate.cc index 8d7d2d39cd..c45effb0ac 100644 --- a/src/tests/testBoilerplate.cc +++ b/src/tests/testBoilerplate.cc @@ -1,6 +1,6 @@ #define SQUID_UNIT_TEST 1 -#include "squid.h" +#include "squid-old.h" #include "testBoilerplate.h" #if HAVE_STDEXCEPT diff --git a/src/tests/testCacheManager.cc b/src/tests/testCacheManager.cc index 702a88fb69..355057fb36 100644 --- a/src/tests/testCacheManager.cc +++ b/src/tests/testCacheManager.cc @@ -1,6 +1,6 @@ #define SQUID_UNIT_TEST 1 -#include "squid.h" +#include "squid-old.h" #include #include "mgr/Action.h" diff --git a/src/tests/testConfigParser.cc b/src/tests/testConfigParser.cc index ecf5964793..b17fd7a4d8 100644 --- a/src/tests/testConfigParser.cc +++ b/src/tests/testConfigParser.cc @@ -1,5 +1,5 @@ #define SQUID_UNIT_TEST 1 -#include "config.h" +#include "squid.h" #include "testConfigParser.h" #include "SquidString.h" diff --git a/src/tests/testCoss.cc b/src/tests/testCoss.cc index 1296441066..3fd5f9945e 100644 --- a/src/tests/testCoss.cc +++ b/src/tests/testCoss.cc @@ -1,5 +1,5 @@ #define SQUID_UNIT_TEST 1 -#include "squid.h" +#include "squid-old.h" #include "testCoss.h" #include "Store.h" #include "SwapDir.h" diff --git a/src/tests/testDiskIO.cc b/src/tests/testDiskIO.cc index 4c5b4cdcea..343b296dc8 100644 --- a/src/tests/testDiskIO.cc +++ b/src/tests/testDiskIO.cc @@ -1,6 +1,6 @@ #define SQUID_UNIT_TEST 1 -#include "squid.h" +#include "squid-old.h" #include "testDiskIO.h" #include "Store.h" #include "SwapDir.h" diff --git a/src/tests/testEvent.cc b/src/tests/testEvent.cc index 57fb0a3df4..7741e61f39 100644 --- a/src/tests/testEvent.cc +++ b/src/tests/testEvent.cc @@ -1,5 +1,5 @@ #define SQUID_UNIT_TEST 1 -#include "config.h" +#include "squid.h" #include diff --git a/src/tests/testEventLoop.cc b/src/tests/testEventLoop.cc index 03412038d2..d5f3bb2e96 100644 --- a/src/tests/testEventLoop.cc +++ b/src/tests/testEventLoop.cc @@ -1,5 +1,5 @@ #define SQUID_UNIT_TEST 1 -#include "config.h" +#include "squid.h" #include diff --git a/src/tests/testHttpParser.cc b/src/tests/testHttpParser.cc index 5081dc6382..7625cc55ee 100644 --- a/src/tests/testHttpParser.cc +++ b/src/tests/testHttpParser.cc @@ -1,5 +1,5 @@ #define SQUID_UNIT_TEST 1 -#include "config.h" +#include "squid.h" #include diff --git a/src/tests/testHttpReply.cc b/src/tests/testHttpReply.cc index 60938c0b70..f7c0a2152c 100644 --- a/src/tests/testHttpReply.cc +++ b/src/tests/testHttpReply.cc @@ -1,5 +1,5 @@ #define SQUID_UNIT_TEST 1 -#include "config.h" +#include "squid.h" #include #include "testHttpReply.h" diff --git a/src/tests/testHttpRequest.cc b/src/tests/testHttpRequest.cc index 01d0a3c6de..04a01c4942 100644 --- a/src/tests/testHttpRequest.cc +++ b/src/tests/testHttpRequest.cc @@ -1,5 +1,5 @@ #define SQUID_UNIT_TEST 1 -#include "config.h" +#include "squid.h" #include diff --git a/src/tests/testHttpRequestMethod.cc b/src/tests/testHttpRequestMethod.cc index 57c4e819c8..c9c1d285e7 100644 --- a/src/tests/testHttpRequestMethod.cc +++ b/src/tests/testHttpRequestMethod.cc @@ -1,6 +1,6 @@ #define SQUID_UNIT_TEST 1 -#include "squid.h" +#include "squid-old.h" #include #include "Mem.h" diff --git a/src/tests/testMain.cc b/src/tests/testMain.cc index 01042cbf23..30a6a82bbc 100644 --- a/src/tests/testMain.cc +++ b/src/tests/testMain.cc @@ -1,5 +1,5 @@ #define SQUID_UNIT_TEST 1 -#include "config.h" +#include "squid.h" #include #include diff --git a/src/tests/testNull.cc b/src/tests/testNull.cc index 62e93948ce..a987615b13 100644 --- a/src/tests/testNull.cc +++ b/src/tests/testNull.cc @@ -1,5 +1,5 @@ #define SQUID_UNIT_TEST 1 -#include "squid.h" +#include "squid-old.h" #include "testNull.h" #include "Store.h" #include "SwapDir.h" diff --git a/src/tests/testRock.cc b/src/tests/testRock.cc index 1b604c4e07..c64f9167ec 100644 --- a/src/tests/testRock.cc +++ b/src/tests/testRock.cc @@ -1,5 +1,5 @@ #define SQUID_UNIT_TEST 1 -#include "config.h" +#include "squid.h" #include "DiskIO/DiskIOModule.h" #include "HttpHeader.h" diff --git a/src/tests/testStatHist.cc b/src/tests/testStatHist.cc index 80ca4c23c8..8e03768661 100644 --- a/src/tests/testStatHist.cc +++ b/src/tests/testStatHist.cc @@ -1,5 +1,5 @@ #define SQUID_UNIT_TEST 1 -#include "config.h" +#include "squid.h" #include "testStatHist.h" #include "StatHist.h" diff --git a/src/tests/testStore.cc b/src/tests/testStore.cc index 0c4989d25a..3d4b440753 100644 --- a/src/tests/testStore.cc +++ b/src/tests/testStore.cc @@ -1,6 +1,6 @@ #define SQUID_UNIT_TEST 1 -#include "squid.h" +#include "squid-old.h" #include "testStore.h" #include "Store.h" diff --git a/src/tests/testStore.h b/src/tests/testStore.h index cd09fd0f3b..90ae69d54d 100644 --- a/src/tests/testStore.h +++ b/src/tests/testStore.h @@ -2,7 +2,7 @@ #ifndef SQUID_SRC_TEST_STORE_H #define SQUID_SRC_TEST_STORE_H -#include "squid.h" +#include "squid-old.h" #include "Store.h" #include diff --git a/src/tests/testStoreController.cc b/src/tests/testStoreController.cc index 8d7c976e30..70a892ca59 100644 --- a/src/tests/testStoreController.cc +++ b/src/tests/testStoreController.cc @@ -1,6 +1,6 @@ #define SQUID_UNIT_TEST 1 -#include "squid.h" +#include "squid-old.h" #include "testStoreController.h" #include "Store.h" diff --git a/src/tests/testStoreEntryStream.cc b/src/tests/testStoreEntryStream.cc index 4b0abdc4b2..a1a75e0dc5 100644 --- a/src/tests/testStoreEntryStream.cc +++ b/src/tests/testStoreEntryStream.cc @@ -1,6 +1,6 @@ #define SQUID_UNIT_TEST 1 -#include "squid.h" +#include "squid-old.h" #include "Mem.h" #include "testStore.h" #include "testStoreEntryStream.h" diff --git a/src/tests/testStoreHashIndex.cc b/src/tests/testStoreHashIndex.cc index 56c97639b5..ede33dcb45 100644 --- a/src/tests/testStoreHashIndex.cc +++ b/src/tests/testStoreHashIndex.cc @@ -1,6 +1,6 @@ #define SQUID_UNIT_TEST 1 -#include "squid.h" +#include "squid-old.h" #include "testStoreHashIndex.h" #include "Store.h" diff --git a/src/tests/testStoreSupport.cc b/src/tests/testStoreSupport.cc index 3cc320f234..89664c5493 100644 --- a/src/tests/testStoreSupport.cc +++ b/src/tests/testStoreSupport.cc @@ -32,7 +32,7 @@ */ #define SQUID_UNIT_TEST 1 -#include "config.h" +#include "squid.h" #include "testStoreSupport.h" #include "event.h" #include "EventLoop.h" diff --git a/src/tests/testString.cc b/src/tests/testString.cc index 6667d7ac76..32d3e9a6c6 100644 --- a/src/tests/testString.cc +++ b/src/tests/testString.cc @@ -1,5 +1,5 @@ #define SQUID_UNIT_TEST 1 -#include "config.h" +#include "squid.h" #include "testString.h" #include "SquidString.h" diff --git a/src/tests/testURL.cc b/src/tests/testURL.cc index a9adf6aca1..89997eac76 100644 --- a/src/tests/testURL.cc +++ b/src/tests/testURL.cc @@ -1,5 +1,5 @@ #define SQUID_UNIT_TEST 1 -#include "config.h" +#include "squid.h" #include diff --git a/src/tests/testURLScheme.cc b/src/tests/testURLScheme.cc index e6e1b8ac20..5b8678b66a 100644 --- a/src/tests/testURLScheme.cc +++ b/src/tests/testURLScheme.cc @@ -1,6 +1,6 @@ #define SQUID_UNIT_TEST 1 -#include "squid.h" +#include "squid-old.h" #include diff --git a/src/tests/testUfs.cc b/src/tests/testUfs.cc index 654b22c5c4..34e129135a 100644 --- a/src/tests/testUfs.cc +++ b/src/tests/testUfs.cc @@ -1,5 +1,5 @@ #define SQUID_UNIT_TEST 1 -#include "config.h" +#include "squid.h" #include "testUfs.h" #include "Store.h" #include "SwapDir.h" diff --git a/src/tests/test_http_range.cc b/src/tests/test_http_range.cc index 02212f2312..49f36ee590 100644 --- a/src/tests/test_http_range.cc +++ b/src/tests/test_http_range.cc @@ -32,7 +32,7 @@ * */ #define SQUID_UNIT_TEST 1 -#include "config.h" +#include "squid.h" #if 0 //#include "Store.h" diff --git a/src/time.cc b/src/time.cc index bb0bbdd9c8..898bb0f0ee 100644 --- a/src/time.cc +++ b/src/time.cc @@ -31,7 +31,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * */ -#include "config.h" +#include "squid.h" #include "SquidTime.h" struct timeval current_time; diff --git a/src/tools.cc b/src/tools.cc index bc0d83162e..3020753499 100644 --- a/src/tools.cc +++ b/src/tools.cc @@ -32,7 +32,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "base/Subscription.h" #include "fde.h" #include "ICP.h" diff --git a/src/tunnel.cc b/src/tunnel.cc index dbad0d7f09..739ae2a59b 100644 --- a/src/tunnel.cc +++ b/src/tunnel.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "errorpage.h" #include "HttpRequest.h" #include "fde.h" diff --git a/src/typedefs.h b/src/typedefs.h index f7ba5b0051..85db563982 100644 --- a/src/typedefs.h +++ b/src/typedefs.h @@ -31,7 +31,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #ifndef SQUID_TYPEDEFS_H #define SQUID_TYPEDEFS_H diff --git a/src/ufsdump.cc b/src/ufsdump.cc index a3545de45e..46c416e3a8 100644 --- a/src/ufsdump.cc +++ b/src/ufsdump.cc @@ -32,7 +32,7 @@ * */ -#include "config.h" +#include "squid.h" #include "StoreMeta.h" #include "StoreMetaUnpacker.h" #include "Store.h" diff --git a/src/unlinkd.cc b/src/unlinkd.cc index 5779d3b41c..23c7074a1a 100644 --- a/src/unlinkd.cc +++ b/src/unlinkd.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "SquidTime.h" #include "StatCounters.h" #include "SwapDir.h" diff --git a/src/unlinkd_daemon.cc b/src/unlinkd_daemon.cc index 292b036968..e9dbf53e5e 100644 --- a/src/unlinkd_daemon.cc +++ b/src/unlinkd_daemon.cc @@ -34,7 +34,7 @@ #define SQUID_HELPER 1 -#include "config.h" +#include "squid.h" #if HAVE_PATHS_H #include diff --git a/src/url.cc b/src/url.cc index 5660c53d58..8c485f2555 100644 --- a/src/url.cc +++ b/src/url.cc @@ -33,7 +33,7 @@ * */ -#include "config.h" +#include "squid.h" #include "URL.h" #include "HttpRequest.h" #include "URLScheme.h" diff --git a/src/urn.cc b/src/urn.cc index 93126175e5..544e9498a4 100644 --- a/src/urn.cc +++ b/src/urn.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "errorpage.h" #include "StoreClient.h" #include "Store.h" diff --git a/src/wccp.cc b/src/wccp.cc index cefcbe2286..2bcc5db0d4 100644 --- a/src/wccp.cc +++ b/src/wccp.cc @@ -32,11 +32,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * */ -#include "config.h" +#include "squid.h" #if USE_WCCP -#include "squid.h" +#include "squid-old.h" #include "comm.h" #include "comm/Connection.h" #include "comm/Loops.h" diff --git a/src/wccp2.cc b/src/wccp2.cc index 35aeb6c738..521fee239d 100644 --- a/src/wccp2.cc +++ b/src/wccp2.cc @@ -30,7 +30,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #if USE_WCCPv2 diff --git a/src/whois.cc b/src/whois.cc index 9573c72ea4..b2c74b4350 100644 --- a/src/whois.cc +++ b/src/whois.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "comm/Write.h" #include "errorpage.h" #include "Store.h" diff --git a/src/win32.cc b/src/win32.cc index 81872324be..3d5f0cb38f 100644 --- a/src/win32.cc +++ b/src/win32.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "squid_windows.h" #if _SQUID_MSWIN_ diff --git a/src/wordlist.cc b/src/wordlist.cc index c580f612a9..d937da0fd9 100644 --- a/src/wordlist.cc +++ b/src/wordlist.cc @@ -33,7 +33,7 @@ * */ -#include "config.h" +#include "squid.h" #include "wordlist.h" #include "MemBuf.h" diff --git a/src/wordlist.h b/src/wordlist.h index e6aa34f0fe..165ab5b379 100644 --- a/src/wordlist.h +++ b/src/wordlist.h @@ -32,7 +32,7 @@ #ifndef SQUID_WORDLIST_H #define SQUID_WORDLIST_H -#include "squid.h" +#include "squid-old.h" #include "MemPool.h" class wordlist diff --git a/test-suite/ESIExpressions.cc b/test-suite/ESIExpressions.cc index bf3c82fddd..5649bad761 100644 --- a/test-suite/ESIExpressions.cc +++ b/test-suite/ESIExpressions.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "esi/Expression.h" int diff --git a/test-suite/MemPoolTest.cc b/test-suite/MemPoolTest.cc index 1ce1e934f5..e2730eb2f4 100644 --- a/test-suite/MemPoolTest.cc +++ b/test-suite/MemPoolTest.cc @@ -32,7 +32,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid.h" +#include "squid-old.h" #if USE_MEMPOOLS diff --git a/test-suite/StackTest.cc b/test-suite/StackTest.cc index c996f3ac57..4606f95d56 100644 --- a/test-suite/StackTest.cc +++ b/test-suite/StackTest.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003 Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "Stack.h" int diff --git a/test-suite/VirtualDeleteOperator.cc b/test-suite/VirtualDeleteOperator.cc index 51db1e6c0f..68567d14c2 100644 --- a/test-suite/VirtualDeleteOperator.cc +++ b/test-suite/VirtualDeleteOperator.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003 Robert Collins */ -#include "squid.h" +#include "squid-old.h" #if HAVE_IOSTREAM #include diff --git a/test-suite/debug.cc b/test-suite/debug.cc index 19c7011d02..50f64dd3c0 100644 --- a/test-suite/debug.cc +++ b/test-suite/debug.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003 Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "stmem.h" #include "mem_node.h" diff --git a/test-suite/hash.c b/test-suite/hash.c index aad95dc151..e11d118e95 100644 --- a/test-suite/hash.c +++ b/test-suite/hash.c @@ -32,7 +32,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * */ -#include "config.h" +#include "squid.h" #if HAVE_UNISTD_H #include diff --git a/test-suite/mem_hdr_test.cc b/test-suite/mem_hdr_test.cc index 76896265d7..fb4443fa8a 100644 --- a/test-suite/mem_hdr_test.cc +++ b/test-suite/mem_hdr_test.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003 Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "stmem.h" #include "mem_node.h" #include "Generic.h" diff --git a/test-suite/mem_node_test.cc b/test-suite/mem_node_test.cc index f1d3a5b31b..d362be2fcb 100644 --- a/test-suite/mem_node_test.cc +++ b/test-suite/mem_node_test.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "mem_node.h" #if HAVE_IOSTREAM diff --git a/test-suite/membanger.c b/test-suite/membanger.c index 77eddbddcd..19e495301d 100644 --- a/test-suite/membanger.c +++ b/test-suite/membanger.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "hash.h" #if HAVE_UNISTD_H diff --git a/test-suite/pconn-banger.c b/test-suite/pconn-banger.c index 6bb8ebf997..7dbf65c5cc 100644 --- a/test-suite/pconn-banger.c +++ b/test-suite/pconn-banger.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" #include "compat/getaddrinfo.h" #if HAVE_UNISTD_H diff --git a/test-suite/refcount.cc b/test-suite/refcount.cc index 93ee96fc00..fdb17a4119 100644 --- a/test-suite/refcount.cc +++ b/test-suite/refcount.cc @@ -33,7 +33,7 @@ * */ -#include "squid.h" +#include "squid-old.h" #include "RefCount.h" class _ToRefCount :public RefCountable diff --git a/test-suite/splay.cc b/test-suite/splay.cc index 64beb7d17c..6f0a147fcd 100644 --- a/test-suite/splay.cc +++ b/test-suite/splay.cc @@ -5,7 +5,7 @@ * http://bobo.link.cs.cmu.edu/cgi-bin/splay/splay-cgi.pl */ -#include "config.h" +#include "squid.h" #if HAVE_STDIO_H #include diff --git a/test-suite/syntheticoperators.cc b/test-suite/syntheticoperators.cc index dbdebd4e6d..6c9dfdb9df 100644 --- a/test-suite/syntheticoperators.cc +++ b/test-suite/syntheticoperators.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003 Robert Collins */ -#include "squid.h" +#include "squid-old.h" #include "stmem.h" #include "mem_node.h" diff --git a/test-suite/tcp-banger2.c b/test-suite/tcp-banger2.c index aa297a14a0..63d0094f09 100644 --- a/test-suite/tcp-banger2.c +++ b/test-suite/tcp-banger2.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" /* $Id$ diff --git a/test-suite/tcp-banger3.c b/test-suite/tcp-banger3.c index e3d4f3fbe6..33c69a5e29 100644 --- a/test-suite/tcp-banger3.c +++ b/test-suite/tcp-banger3.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" /* * On some systems, FD_SETSIZE is set to something lower than the diff --git a/test-suite/test_tools.cc b/test-suite/test_tools.cc index 235ab3c796..86f415f46e 100644 --- a/test-suite/test_tools.cc +++ b/test-suite/test_tools.cc @@ -5,7 +5,7 @@ // XXX: This file is made of large pieces of src/tools.cc // with only a few minor modifications. TODO: redesign or delete. -#include "squid.h" +#include "squid-old.h" void xassert(const char *msg, const char *file, int line) diff --git a/test-suite/testheaders.sh b/test-suite/testheaders.sh index 58b21d5b1c..1036dcd319 100755 --- a/test-suite/testheaders.sh +++ b/test-suite/testheaders.sh @@ -24,7 +24,7 @@ for f in $@; do if [ ! -f "$t.o" -o $f -nt "$t.o" ]; then echo >$t.cc < diff --git a/tools/cachemgr.cc b/tools/cachemgr.cc index a8c3930ee6..0aabb5bbc4 100644 --- a/tools/cachemgr.cc +++ b/tools/cachemgr.cc @@ -30,7 +30,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base64.h" #include "getfullhostname.h" #include "html_quote.h" diff --git a/tools/purge/conffile.cc b/tools/purge/conffile.cc index 81f0c21ad0..177051ca23 100644 --- a/tools/purge/conffile.cc +++ b/tools/purge/conffile.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" // // $Id$ diff --git a/tools/purge/convert.cc b/tools/purge/convert.cc index 39013172f1..6ffb2a6810 100644 --- a/tools/purge/convert.cc +++ b/tools/purge/convert.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" // // $Id$ diff --git a/tools/purge/copyout.cc b/tools/purge/copyout.cc index 40ad881f74..c7db508cdb 100644 --- a/tools/purge/copyout.cc +++ b/tools/purge/copyout.cc @@ -42,7 +42,7 @@ #pragma implementation #endif -#include "config.h" +#include "squid.h" #include "copyout.hh" //#include diff --git a/tools/purge/purge.cc b/tools/purge/purge.cc index 4f3d47bee9..de27261d6a 100644 --- a/tools/purge/purge.cc +++ b/tools/purge/purge.cc @@ -97,7 +97,7 @@ #pragma implementation #endif -#include "config.h" +#include "squid.h" // for xstrdup #include "util.h" diff --git a/tools/purge/signal.cc b/tools/purge/signal.cc index 258106c421..758978afe6 100644 --- a/tools/purge/signal.cc +++ b/tools/purge/signal.cc @@ -49,7 +49,7 @@ #pragma implementation #endif -#include "config.h" +#include "squid.h" #include "signal.hh" //#include diff --git a/tools/purge/signal.hh b/tools/purge/signal.hh index 8760624b4c..1d0f46eab1 100644 --- a/tools/purge/signal.hh +++ b/tools/purge/signal.hh @@ -51,7 +51,7 @@ #ifndef _SIGNAL_HH #define _SIGNAL_HH -#include "config.h" +#include "squid.h" #if HAVE_SIGNAL_H #include diff --git a/tools/purge/socket.cc b/tools/purge/socket.cc index ce1b4dd879..20bac0a796 100644 --- a/tools/purge/socket.cc +++ b/tools/purge/socket.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "squid.h" // // $Id$ diff --git a/tools/purge/squid-tlv.cc b/tools/purge/squid-tlv.cc index 9232e81cdc..275f8c6325 100644 --- a/tools/purge/squid-tlv.cc +++ b/tools/purge/squid-tlv.cc @@ -39,7 +39,7 @@ #pragma implementation #endif -#include "config.h" +#include "squid.h" //#include #include "squid-tlv.hh" diff --git a/tools/squidclient.cc b/tools/squidclient.cc index e6b5172d22..05b5cd93dc 100644 --- a/tools/squidclient.cc +++ b/tools/squidclient.cc @@ -32,7 +32,7 @@ * */ -#include "config.h" +#include "squid.h" #include "base64.h" #include "ip/Address.h" #include "rfc1123.h"