Renamed squid.h to squid-old.h and config.h to squid.h

diff --git a/compat/GnuRegex.c b/compat/GnuRegex.c
index 2717975b06f1ce0b416c07f88581343d928a99db..d9cda4ec2e92a95c8938861b224cb82b1a44a82d 100644 (file)
--- 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 c9d32799b400df3f489e9ad8f5ccdb74b6012cc9..922cea02d34758fb6be804858c2aee79d94847a6 100644 (file)
--- 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 e36ae437941bc54986ba3576f847b41c5915eb87..527205d90df7edc87633ff1cf777bc97dad14799 100644 (file)
--- 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 bcad2effb3c8d7912abc6f8b9738e572b26b097e..a5557a0d707b127e373029351b72f352bfa1fe02 100644 (file)
--- 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 b964509f347f032b02ac23046925ecb6f54e6e2d..943ee0763a2a7ea7e1003fdf7e3de66d5c503285 100644 (file)
--- 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 c60d88b8b9b45cec8758defeeef5f88fdd732159..e15892c3be215ce35fe542a52192d526c3a0121e 100644 (file)
--- 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 704a0a6fe40cce997cc208ea7eed8d7cced49152..f4f9d6419fe5cfccd53d17e5a118a54f387a5255 100644 (file)
--- 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 <martinh@gnu.org> to make Squid build on

diff --git a/compat/eui64_aton.c b/compat/eui64_aton.c
index 020fdac9e6fce6ed71be6da3b7faef27ed0cd01b..2f1cf2d139408db12ff0f7a45015ad9328dc255a 100644 (file)
--- 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 e48b9b6310f18d97c35fbc2c847af5b3223c3b67..2a4ca99d2a180fc78c781703c7d8a1c3d3cb03d7 100644 (file)
--- 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 3c799db578d921885c9676745efea55718694668..d0b33f639231e77e01dd7c58c6276b4c61567bc2 100644 (file)
--- 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 92e423757baa274a891e95a6eb6fe29fae883f46..35a8b9def4cc08197267a981a93e3bebab4e4810 100644 (file)
--- 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 75315ef35d25e0d65e15ff7a40f56a45424f9adc..ea44c1758739b917d9ecae0d3616181e57953370 100644 (file)
--- 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 4753b74346afc339f0dacc538806a7d848022193..b71ed65afa84a27dc043de0fc8b931a04299a96f 100644 (file)
--- 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 2eb748e81b43b6f30f0918eb0820c4c531d3cb05..5548dff4ad0cc92dcfcd87bb0e59990ff38d0c2c 100644 (file)
--- 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 f5b3c5f29c822e17f390b045c3b49f758f8d6979..4cae8cfbf50f727c1b8febc0e6f6af663cbe9b47 100644 (file)
--- 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 5e07ec14e2100144ba67c77e914d135f53e0cc03..6d06b710459bbac5f2b6f1bacbd6eeff05ae1194 100644 (file)
--- a/compat/psignal.c
+++ b/compat/psignal.c
@@ -2,7 +2,7 @@
  * Author:   Jens-S. V?ckler <voeckler@rvs.uni-hannover.de>
  * 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 29a44c34514d9f166a0f692e7296182495749968..8ca7e2402bb8f99ec231a793b0e464ab77d809e7 100644 (file)
--- 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 1e59172dfe169023543b1052956eef27d03c760c..de510cb07d2a959109262d8562444654ac8cda4d 100644 (file)
--- a/compat/strerror.c
+++ b/compat/strerror.c
@@ -32,7 +32,7 @@
  *
  */
 
-#include "config.h"
+#include "squid.h"
 
 #if HAVE_ERRNO_H
 #include <errno.h>

diff --git a/compat/strnrchr.c b/compat/strnrchr.c
index d5d1753553298648fd632a24fc0bb85694b02e6a..b26b4f209709600164bd69b6f03f2367c31d333c 100644 (file)
--- 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 7c2f058deda73822ef4e5268541ad15041526d60..f64cecdda61b46b3b30a052350884ffebc0113ea 100644 (file)
--- 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 0e2739f682a10cda5b8bca71bff4a776fd31af19..5fbd788209d22b6bf333b444e2a714e122478c02 100644 (file)
--- a/compat/strsep.c
+++ b/compat/strsep.c
@@ -17,7 +17,7 @@
  * USA.
  */
 
-#include "config.h"
+#include "squid.h"
 #include "compat/strsep.h"
 
 #include <string.h>

diff --git a/compat/strtoll.c b/compat/strtoll.c
index da7fc5fb356471bfd01548fdf0b9914222f85d10..8b3ad48c20e67755721b11240cbf651b06f0ad6b 100644 (file)
--- a/compat/strtoll.c
+++ b/compat/strtoll.c
@@ -33,7 +33,7 @@
 
 /* modified for long long <mgd@swarm.org> 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 8e61f4467164efed253a72aeea69a2c9f318f65d..6e4e825b5fd2c388b30477faa3b0cb462f443f85 100644 (file)
--- 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 11a42e7a9c066884a42f470e403f1710c6434330..d131a12814ab59a002f9408959731d5b106d2d77 100644 (file)
--- 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 <assert.h>

diff --git a/compat/xalloc.cc b/compat/xalloc.cc
index bd84bef9e201e32313c91dc5bc40b0785b07cea8..a4eafa9dad98aae0d4c9ae6a2b30e422e4feee21 100644 (file)
--- 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 a63be5f47a064864a0a7d5b4b486656a70c57665..363efcaf55020979847fc2e719b2562e82783b82 100644 (file)
--- 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 34d2ecd8a9d5c738cc15b0888ee7a291b907a3a7..77db689ef0a204c4e9ccc642cdeeb2cc7ed1cdcc 100644 (file)
--- 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 1e83e05fb22214a51482a7c131d13d233530a284..81f904fb44efaa421683662d3a5a103d17cf0c63 100644 (file)
--- 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 9650e0a662d4902183acb17f0b227bdae996528d..9dfcc855f1a3e0f05450b9f241e321992f05895e 100644 (file)
--- 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 22bccd5d5249d32fade98864cd821febd1560bea..364f6f6b0a446ced8cad262919522e7182a96d3c 100644 (file)
--- 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 2ec5ef4d96ec302a821fa4c2018c466a305af9b7..04e40ab827337dd3721da4c3b72841554eeac5bc 100644 (file)
--- 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 e6783080b0cb9ba6a7efcfdf5b600954e53943a3..ff417e8839b58327aad105f0c3914fdd2393dd0e 100644 (file)
--- 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 e04365ed700bc5f9e80a2a167d4830079bbbfca7..cbb72d3e1e276e43518591c5c889818a01530226 100644 (file)
--- 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 <stdio.h>
 #include <stdlib.h>

diff --git a/helpers/basic_auth/MSNT/denyusers.cc b/helpers/basic_auth/MSNT/denyusers.cc
index 4bf86cbe71e9b60fd9555691ffd9f4b7caa85cf0..6192fe99e1ac57bab8279b0b86b1c01d8c366990 100644 (file)
--- 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 a213f3b8902fd9305f36393ffec1dde09e83483e..b6b844d742235a61cb88cf89fbf437d4eaffbf94 100644 (file)
--- 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 3074c1eddd27e131eb0a91ea48422a1753678f3a..ef889e55c29132ca91547db73a3047b3bd2cf6a4 100644 (file)
--- 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 <stdio.h>

diff --git a/helpers/basic_auth/MSNT/valid.cc b/helpers/basic_auth/MSNT/valid.cc
index f82dab63c5728a288efb043617069a34b12065e4..ce385dfab275a3354138d0f577f8f6bcb5790abf 100644 (file)
--- 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 <sys/types.h>
 #endif

diff --git a/helpers/basic_auth/NCSA/basic_ncsa_auth.cc b/helpers/basic_auth/NCSA/basic_ncsa_auth.cc
index d624306a8abbb81b5e702b0b9e185f91a8381b1d..f5ef97e643319652de8468fa4f808a393fd7a649 100644 (file)
--- 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 410ac4fa04a6d59b4203cc97e6ca2a323018fd17..abffb9ae6dc9e9a4777cde699a9edf4bf4b3fb10 100644 (file)
--- 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 <string.h>

diff --git a/helpers/basic_auth/NIS/basic_nis_auth.cc b/helpers/basic_auth/NIS/basic_nis_auth.cc
index 75166726c7e34a7e4667369db30c0121dd6122f3..9a0068dcfdae86e8128305a4eda1df8cd2157205 100644 (file)
--- 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 d6558bafda850a17194e3fc1f0f072cb754fba9b..075eb5b6678b27dbeaeaff6c3f34cf1f48825fb7 100644 (file)
--- 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 <stdlib.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/helpers/basic_auth/PAM/basic_pam_auth.cc b/helpers/basic_auth/PAM/basic_pam_auth.cc
index 3f8f0eee1c08c48ae0492f2dd0bb569505ea131f..8be058e8176936b4a70a838d303690428d476872 100644 (file)
--- 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 23708aebb9ce8c6198218660ead227e9abd73bae..0cf9b78876d35993b05717487ed55209046be0d7 100644 (file)
--- 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 5a4ba44bf7704f02a1007a55501b302a2acdeac8..96692e525a0d9cbd216d1d81077415c718e8654b 100644 (file)
--- 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       <sys/socket.h>

diff --git a/helpers/basic_auth/SASL/basic_sasl_auth.cc b/helpers/basic_auth/SASL/basic_sasl_auth.cc
index ef0001ea428915d636aade87a733b49fa06ea60a..bdff532a2fbb9d30d41edf91d51955a501b52d8c 100644 (file)
--- 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 bdaf3ca4863feabf4904a8a86299e8da5255e1b1..2e715112c0717a9aa7c3c48b17c0190ba6aa12df 100644 (file)
--- 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 7bfcf053ef81fa7a7b61b8394b8dbf67d66efba0..ef43acfe3cec3818155ac391ddcde33791702f02 100644 (file)
--- 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 147ac0c5b0d07cb27e39b81358fae33bf9584322..1a0f419ce1d924a917c3b6a3f2b05671ca7c6327 100644 (file)
--- 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 85657b04a20686febb34d5f1498c34d93644972b..65a76be56b1cfe6778d44a33c3347803d7c0729c 100644 (file)
--- 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 7e57b2e59f25adf2160a9561319734addcf651d3..bb501b0f7e7031697d3941e23f5303319ece7699 100644 (file)
--- 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 a83ac45bd442da8d6f323eca3ddc092fdaadf173..0a62f1d8183157ae49c6a692243154577a28b861 100644 (file)
--- 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  <robertc@squid-cache.org>
  */
-#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 d6a6deb5f747fb46e6b00281ab0e8118fd7f0df4..6efcaed9cb63f11095a85b2978e8e8d3d3669ea6 100644 (file)
--- 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 <flavio@marasystems.com>
  */
-#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 e2359a6bc069cf9a465ebb07665f403fc38f38c5..6087df6cfdbbd632419966d9f44f5527cd400b5b 100644 (file)
--- 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  <robertc@squid-cache.org>
  */
-#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 48921f84009cdadc839c371e405ceafa2840f64a..49d896eeb031aa422b1f773f407ff962033b9eb1 100644 (file)
--- 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 5281369f039fbcbe9bb90d358d546cca8e23fc2b..0a40403c9a2804b33f791443b2e3b4a66960a9ad 100644 (file)
--- 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 <flavio@marasystems.com>
  */
-#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 7ea933228a6bf8b4f8c15d37425f6096052e50dd..b0ed8be907ca1a3eb837fc5daccfa065236caf7a 100644 (file)
--- 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  <robertc@squid-cache.org>
  */
 
-#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 a5b46ec3fe6b9a07fb130b86155be8e0a663a733..eb499e69aedaa220fcda1012ff10e029f1a1df05 100644 (file)
--- 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  <robertc@squid-cache.org>
  */
-#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 c45eefae5f3dcb3b4afbf7444de15324e547eb16..62c8a0b2a59a4b96131645fa6849a3b9340e4a53 100644 (file)
--- 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 135a21bd5edeab1ed8ec2c17d57d04bb28374cda..2a1a778ff0b032ea688dbf2787686971d5ebe10a 100644 (file)
--- 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 5cb49c6231a7f3c3b4413acd6253e0e033cb1e8f..5755dbcc5e2aab47a55c5db06c72a6ec75ae4983 100644 (file)
--- 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 7195f623366225b7f4b381a93d53ced6a6cd5904..81cbcaf55f2686eea3d991d7fee09246b2ebd3d8 100644 (file)
--- 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 656cb5d537f25e2d2e866757821cff8d746b9c63..8aa7f22bb7a603056af3de074821aad0a369d4d3 100644 (file)
--- 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 683ef4994c704b0b09e6a147a9a83bb828a17a47..634d6ecad7f259faf030e91ee456de39c6484dff 100644 (file)
--- 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 112e83ec859f252002a29c0a0352188702e73b1d..17779b68143c67d88f62b92d30e9a856762277f9 100644 (file)
--- 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 0495fc51f659b5065aadf98da5fb00ca7de9a927..f5ae7ea0d0d8e8e7e48a6a0120f885c5766d43b3 100644 (file)
--- 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 d15baf69c8f3dc05ccb422da7ed4b18755aae864..594b8559f0bf200c2d3f34de33b4892f4bfd4bbc 100644 (file)
--- 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 d2421f8c7d5f62c701703028700a15f5eb7685b2..fceec56315ea191a16b50856de8e3165d45fcfcc 100644 (file)
--- 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 0c08275404381dc32a9759b0390b2742ff5136e2..c855c865e3635fa22548d29ae57f9af5ed71ee45 100644 (file)
--- 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 5d0b54f76f588f7064dba2dc3085cbecc236213e..a8af1ee7b4087538d2611d858cbb420f5d6aec83 100644 (file)
--- 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 fa9d64b78f3dda122597de29612ea0722653abd3..0b608fb81c57e1f28664d61aa40bb386024f8753 100644 (file)
--- 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 f07d465c57fb1e03a95a94bff2f13bda9079bcb7..bbe19509a8988741a615db00c38c2215e1528a9a 100644 (file)
--- 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 0ef22ff126648045db17fd21a0f3c4162a54df97..d6f37f02e093d0608f21a6ab98c2be64b7c187f7 100644 (file)
--- 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 93b59371624a6d893ab86d4254c8f8752292c1b8..f63a7b86ce87f0e20dbeaa5b7e85158a1c97bc61 100644 (file)
--- 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 5d8ff1df07fca9b163a3ab7257d824d9b694e7e0..e5869e2e97aaa826b6fdcdac5c134c546c5090a2 100644 (file)
--- 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 8dad8e79525b0041d38a4cb1fab451f98301d31f..b5cdecc7f3211d774093038558c19dc4416786b5 100644 (file)
--- 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 48cd3782b96ee1df30794469371a4548ef23a547..ee4c7c0008d44abf7bbbe12fb5a906a56c52d6c7 100644 (file)
--- 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 <stdio.h>

diff --git a/helpers/negotiate_auth/SSPI/negotiate_sspi_auth.cc b/helpers/negotiate_auth/SSPI/negotiate_sspi_auth.cc
index d1d86c9b9d2151a7139f803e127ed0b0f417a761..035668052393a2f76801e1c1632e2c97f778fb10 100644 (file)
--- 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 7d3696abc5c4bd0738cb285d57067c58bee4577b..e383387412554fa0ad53b2aa1351ee8089200f01 100644 (file)
--- 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 e7de2eaca126711288c5d910e9000878da915cb3..4660bdc850bafa8b55a829d394b627df7cc0f832 100644 (file)
--- 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 dbee8cfe50b1d38e88c4fc95212c2247545b8a61..0300edc56ee98830c96d7b2a5f8d355f9d3671d9 100644 (file)
--- 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 857f80f17173145a6782667ead18fe5ea1c916c2..5f209ca2f6b68c39034583607e1913b80e55081d 100644 (file)
--- 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 388319c83d20d6b8cc9e6aa9503ca130468003f5..8f5a6411c852cfe6243cd6a6fb221bf486f5547a 100644 (file)
--- 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 77905e2a8e9eb01ec7f36df2533050e6be36be97..981600e0e3bf6872ab77d6a6a2a5b3b3f4d48bdb 100644 (file)
--- 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 936d2fb9590b8f9754eac94ee65f009602d5f3ba..d18053c40df7c6733f5f0f81d25cd8c0b636b7ca 100644 (file)
--- 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 b594bef46c9f67f999dbe18515817aafc46ad1e7..efab8f51ff6a493ec564b05a8d4056ffacadb802 100644 (file)
--- 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 3e6143af90cd257efb9a9f930c54c4c4282f8b78..5b7b35416610a95f8efdb17ce7aef489c47235aa 100644 (file)
--- a/lib/MemPool.cc
+++ b/lib/MemPool.cc
@@ -33,7 +33,7 @@
  *
  */
 
-#include "config.h"
+#include "squid.h"
 #if HAVE_ASSERT_H
 #include <assert.h>
 #endif

diff --git a/lib/MemPoolChunked.cc b/lib/MemPoolChunked.cc
index 6485b426b66dda0dcb75d91168022581567f6163..8068513a7f1322e6db7184ccc6996c9b5361a80c 100644 (file)
--- a/lib/MemPoolChunked.cc
+++ b/lib/MemPoolChunked.cc
@@ -81,7 +81,7 @@
  *   Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#include "config.h"
+#include "squid.h"
 #if HAVE_ASSERT_H
 #include <assert.h>
 #endif

diff --git a/lib/MemPoolMalloc.cc b/lib/MemPoolMalloc.cc
index 75759932da2550c99ff35e3edd9aca4aeb8ce487..8d9ead1b367a33b57f1098f8f4efca916dbdd627 100644 (file)
--- a/lib/MemPoolMalloc.cc
+++ b/lib/MemPoolMalloc.cc
@@ -34,7 +34,7 @@
  */
 
 
-#include "config.h"
+#include "squid.h"
 #if HAVE_ASSERT_H
 #include <assert.h>
 #endif

diff --git a/lib/Splay.cc b/lib/Splay.cc
index ed4b43671603bbb21e4012c2c8fd0336146fbcf1..50ccc35da7338be17a016463aabd40c36347b789 100644 (file)
--- 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 <stdio.h>

diff --git a/lib/base64.c b/lib/base64.c
index 2881ca0529997a5902c2dd247c1f20aac8db2ecc..b21e519d56ca5916244ecdbc8a6380058ad1fdfa 100644 (file)
--- 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 b58b535dc5d641310f929496590428db447f8b3a..d04f5d7ac40ed71ce3711c3e3bf749fb5f8e8190 100644 (file)
--- 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 392031d911ec6f667eecb9667a0728e48514fae5..cc3c2c322d8dcbbe52b420bd6d0d6661dec699be 100644 (file)
--- 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 2746bf2e046dc9cbe37a105fa5fb766ca3da86cb..75a6a117cef0fb9b510e9d7ad9c42783e71f396c 100644 (file)
--- 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 3a8915cf3995f8d5a50f813ca4016146d336f36c..3c12e3484fc69299b0f8b9f9e20b2280aa60e672 100644 (file)
--- 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 6500e6d9e8d3a529aa041f617a9272072198c254..e95fbc94c42903bd34dd73cdec401e58acd4576b 100644 (file)
--- 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 f962ad2548d85367b2dcfbb501471bc05e33beb7..68c5e305140424ff1cc348d614504fcc52636854 100644 (file)
--- 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 8226d88ca820daf0041e1e22a7e2796fa13e7d63..35f3fbc26b3ca3fa10d625677e37d277e850c737 100644 (file)
--- 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 bd9bee06b359e9e097cdbf072a4fc0d1f5d6d824..61ebae955cee76da7195a8041c5f76cde2cf4279 100644 (file)
--- 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 1d1491bd61d9f85914e79b69773a6622889bc0bd..3b90f87d4dd8059e156e894716aafd568ac15b0d 100644 (file)
--- 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 0f77a7d664a10f56f9a66593255070110665c7f2..e9ceff4dc32982afd855f60f66a617d398137b8e 100644 (file)
--- 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 <stdio.h>
 

diff --git a/lib/malloc_trace.cc b/lib/malloc_trace.cc
index 4d107b60d3308d0214fed81a247dac195dabf96e..ad5f8e8dc5d15afaa2bd5cc6662ac3e1d5f81830 100644 (file)
--- 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 aa10c97f82a11ac23d31cc974369ee11fed16281..c6fa9f2507859293f43d7bfe3dd5b3549e47d647 100644 (file)
--- 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 6df0ce5256bb8334f7e1a5f781b07e951c094259..2985473d81623ed26f7e1a83f995e725ed19f1a3 100644 (file)
--- 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 a53900c994a620008a4d551af90a75f7e6f94ca4..b29b85824e7325da2a4b90caac480fba47e45c5c 100644 (file)
--- 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 <string.h>

diff --git a/lib/profiler/Profiler.cc b/lib/profiler/Profiler.cc
index 1c01ecdfe1a9c1507d2edcf32e10350351a87019..a608ae888eea24051dad8dcf855cbec1e6a8360d 100644 (file)
--- 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 b9587a8b845ef470dc3c29a7a7c50cd7a8cce392..512b31a4958d38142a6417a968939cbd12c62f15 100644 (file)
--- 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 898d37be6ec8c809dc98e1b7b9fad79bc4fc643e..6afc3dff623bc2f1f1979273d8f1ec4d70ace5fd 100644 (file)
--- 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 1c16e88bfaebd2de9d4af4ed2681baae5c736edb..e877bef046d0ab7efb563cd9cfb4ecb8f3bd7d99 100644 (file)
--- 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 d5060fe84471a57d53ed255088c8638fb255a830..add49ff1a3b2c5f931d3df1b125edf5cdf6f3a47 100644 (file)
--- 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 f7530d6c552b4effd4a09b5a66ebdae3c8e18524..9cda34997639ea996fbded869ff6f61dd2db7184 100644 (file)
--- a/lib/rfc2617.c
+++ b/lib/rfc2617.c
@@ -46,7 +46,7 @@
  *
  */
 
-#include "config.h"
+#include "squid.h"
 #include <string.h>
 #include "rfc2617.h"
 #include "md5.h"

diff --git a/lib/rfc2671.c b/lib/rfc2671.c
index f33503138da83ad03ea2560b5e56630dbaa9e587..b53a238e3a218a9ef9379a89b516b5f841dc5173 100644 (file)
--- 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 fa929cb4ca69cc65cb5e3641114bfb82d6dd4eef..fad37024a5ae5e4c1d98b2fcd2d88f2f7b8d6747 100644 (file)
--- 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 06786c4e46c276156012f931cb7599a358182a44..219f56239b29628c5fb89e48eea7cc6441414b24 100644 (file)
--- 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 c28f43fa7f0c59b7575a47eb4b948838a9c76586..79a9f4d0c5547d4cacc2a4d1bf8c835cdf243d7e 100644 (file)
--- 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 0a4878e3fee16885d35b3cccdfb12c611ec1d871..58ee6b190b8d6d50978ca1500d3244aeda0ad149 100644 (file)
--- 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 388a7f1de353f1bab9af4d49cf303599c7cca8b6..4b7b237a2a6eadb495567b0781b05c316713e279 100644 (file)
--- 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 dcfbc36ce85bbb5dd505873946cbf7300af6a512..a67de30a28449370b05a8ee45cfd98ca13d12be3 100644 (file)
--- 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 da841331f0e71cb4bd3e92574e38a72bed5921e7..f0cedca6a5bc2174390e749b2413e51349e920eb 100644 (file)
--- 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 a61dc61a88a775222fd5d064bdd263d8233bbdcf..ae310348972b48d89dba5ada08d14d7766ec8f67 100644 (file)
--- 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 27e466806878e5c32de1d5271961e077b790a142..1cfb224a6eddcb450286ef6be4eeeea10a4fc29e 100644 (file)
--- 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 c48ee3195c5e124445c464af07d78b467c29ede7..ea857864d6554d20b3c241955b574e63cdf99e4a 100644 (file)
--- 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 e5b8b30b2cee05b36968f132d2a6d56f5ec9c354..47f1be256b0954f74c445090f979bc4e7cb0d7ab 100644 (file)
--- 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 9afce50b547e097d223412ebec2b3bc202e87fbd..7efdeac8a9fe535c91b25a7dc70743c46cfe8045 100644 (file)
--- 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 b02894780b4bd54cbbc0a35c8678aef068d18701..9604daee2f04af02f4a286f12edfe28da0a1830c 100644 (file)
--- 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 b556be0b38dd3531bd356f03e42f0cf6e9fd70e0..1040fd433b33c48fb869f355ff8734fae40a8436 100644 (file)
--- 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 45ff27a88d1f519bc0d5d4c441c1a2c6e24dcbd3..d32406a5e9ff5d36f41711e0e28061a4f9543d3b 100644 (file)
--- 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 ea657eb2e126ed5656763a7f51a97f278a15b849..434d97296a50526874f0a9f30200e8e999293a66 100644 (file)
--- 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 c49afc4a98319f15aa12746d5f9bcc7b8f47d42d..c81d9fb33fc378e3a57b52fb7e404d37a5ff7687 100644 (file)
--- 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 6e46be9218f249574e60aa6af2df80efe5e7fa5c..ffbfebbc5a3e9c895713f3fc0f692d7e944dadff 100644 (file)
--- 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 <assert.h>

diff --git a/lib/tests/testMain.cc b/lib/tests/testMain.cc
index 08902d88fb976f05967d477bc84d6833f8ea149e..14febc501d675346dad21ee69c387b0b72df4e38 100644 (file)
--- a/lib/tests/testMain.cc
+++ b/lib/tests/testMain.cc
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "squid.h"
 
 #include <cppunit/BriefTestProgressListener.h>
 #include <cppunit/CompilerOutputter.h>

diff --git a/lib/tests/testRFC1035.cc b/lib/tests/testRFC1035.cc
index 85920bb2049b8fbca9dc1085b040243d5151007c..6902ff8c47d80fc995c946b650956ce322982c6f 100644 (file)
--- 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 <assert.h>

diff --git a/lib/tests/testRFC1738.cc b/lib/tests/testRFC1738.cc
index d989bad82b9589a173738e2f061b0fc4a1ad3f5b..35d301c40a541392f0bdddab9ba1e716f610b70b 100644 (file)
--- 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 <assert.h>

diff --git a/lib/util.c b/lib/util.c
index b1fd1ccdc6d9b0a0c060f1303d225781edabdf99..4824b0ce5e48fd154a233840f43031bbbcad9323 100644 (file)
--- 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 a9f5f94a77ba9d5b1af85021b70c3b5c008a1658..7ad886ac0aac8dd4f5d5dce07e3a6f45d2117826 100644 (file)
--- 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 d4490a3a01f9debc5f2d3572d5c8edb15033b064..d5e4bc50681acde217fb7eec5261ecc4c03df070 100644 (file)
--- 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 0750ba797b2a90e3f42271adeeb5d87c863ef4fa..e1aa5010a93b38df89435c004d1d9f4406158487 100755 (executable)
--- 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 46b154ac5a135da4ad3c8076d71dbc965556795e..def1fad3624c9a8a4c86fa5f0840db19157335ca 100644 (file)
--- a/snmplib/asn1.c
+++ b/snmplib/asn1.c
@@ -31,7 +31,7 @@
  *
  ***************************************************************************/
 
-#include "config.h"
+#include "squid.h"
 
 #include <stdio.h>
 

diff --git a/snmplib/coexistance.c b/snmplib/coexistance.c
index 429d78d77f1fcd1cf162b5cb141efcfdec78334c..2f6ba7e43442438b5eefb0d19d9bb822f90c31fa 100644 (file)
--- 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 <stdio.h>
 

diff --git a/snmplib/mib.c b/snmplib/mib.c
index 021c70a5a730f8f31464af5ddf2b14971922e358..7456e3f4a02c26cec1704cbfe7f29a70cbf1e3d3 100644 (file)
--- 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 <stdio.h>
 

diff --git a/snmplib/parse.c b/snmplib/parse.c
index cad1cc31e046b4dfa71223d880b51f79dbddc305..a9316d1490ead3135b5256f80e8a693c7f09cf01 100644 (file)
--- a/snmplib/parse.c
+++ b/snmplib/parse.c
@@ -23,7 +23,7 @@ SOFTWARE.
 /*
  * parse.c
  */
-#include "config.h"
+#include "squid.h"
 
 #include <stdio.h>
 

diff --git a/snmplib/snmp_api.c b/snmplib/snmp_api.c
index c22d7e9a749280259a5fe63692924d14901a7195..a512df5f5c98f31c31b9aec936e7789a0fe84b0d 100644 (file)
--- a/snmplib/snmp_api.c
+++ b/snmplib/snmp_api.c
@@ -24,7 +24,7 @@
  *
  **********************************************************************/
 
-#include "config.h"
+#include "squid.h"
 
 #include <stdio.h>
 

diff --git a/snmplib/snmp_api_error.c b/snmplib/snmp_api_error.c
index e9a23e0094b3fe70d4e9c68969485006fd64bfa2..f5629a77a703dcd17394c925b42200dd00178b3a 100644 (file)
--- 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 <stdio.h>

diff --git a/snmplib/snmp_error.c b/snmplib/snmp_error.c
index a68d4dbfa02d1b48f402147f601af5cb824cf1a5..86a6c54bcfb95ffb5f22c08a35a7b8b363901021 100644 (file)
--- a/snmplib/snmp_error.c
+++ b/snmplib/snmp_error.c
@@ -26,7 +26,7 @@
  *
  **********************************************************************/
 
-#include "config.h"
+#include "squid.h"
 
 #include <stdio.h>
 

diff --git a/snmplib/snmp_msg.c b/snmplib/snmp_msg.c
index 2fb85665b549492411a1064f6bbce2f9e79ffe60..25d84dcff62bc25eabd481e6d171bda5438ed757 100644 (file)
--- a/snmplib/snmp_msg.c
+++ b/snmplib/snmp_msg.c
@@ -33,7 +33,7 @@
  *
  **********************************************************************/
 
-#include "config.h"
+#include "squid.h"
 
 #include <stdio.h>
 

diff --git a/snmplib/snmp_pdu.c b/snmplib/snmp_pdu.c
index 0acbf7eab2af07d424304b4b127c455eb8b7efd1..8a7c2a437ec2988eaf61f89b017273b1b15d6e3a 100644 (file)
--- a/snmplib/snmp_pdu.c
+++ b/snmplib/snmp_pdu.c
@@ -33,7 +33,7 @@
  *
  **********************************************************************/
 
-#include "config.h"
+#include "squid.h"
 
 #include <stdio.h>
 

diff --git a/snmplib/snmp_vars.c b/snmplib/snmp_vars.c
index f438d0348cb05d3ad4494a575b2b0f4b68a76f35..c5383bcccb1a5cdc7ad29b5f9abe7fa1eab3f2fc 100644 (file)
--- a/snmplib/snmp_vars.c
+++ b/snmplib/snmp_vars.c
@@ -32,7 +32,7 @@
  *
  **********************************************************************/
 
-#include "config.h"
+#include "squid.h"
 
 #include <stdio.h>
 

diff --git a/snmplib/snmplib_debug.c b/snmplib/snmplib_debug.c
index 8e398ccbdf01d1da9d5adbc270537c2a6eac5d70..d6e5534e2956472762239a629db2dc668f5c9825 100644 (file)
--- 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 <stdio.h>
 #endif

diff --git a/src/AccessLogEntry.cc b/src/AccessLogEntry.cc
index 96b4410c20b7493cae77f7038703971f52123629..d2dca0cfe5b631217d5e0423a4a1e2f0fd9dc482 100644 (file)
--- 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 ae4faabb4a74d5143d3819980306483b395a392e..0311820226b8d86ecb0040c5265874a1265d21ed 100644 (file)
--- 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 affe914be210dcfc30f2236d242691b120652f44..392db379382e5bee51c59f3a197d345a9b43a97b 100644 (file)
--- 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 f0e5edb3802fd10a888f699de540e0986ea8aea7..35f42146b2d19e8e5a00f0c137fdb11da4fc1e75 100644 (file)
--- 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 a08726129d6c7ebfb86e11c32e44cc3d84ba5296..3cde9893724d4515238b370e7aaa6d12518c3b5f 100644 (file)
--- 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 2a543ee2a8d5368bc0ba192b5845d32afd969aad..bdbe3a37a2953ba895d810a901f5563a2cc0b9d2 100644 (file)
--- 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 eb4826df3b3713112c4f09b86e090d4c8c74ad3d..b2f2cdb9716efab0ecc5aa5a7f01d8d779272cf1 100644 (file)
--- 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 bd2fdd1cde65e8135cf5f6c5f614a60f9601b7e9..3b99f4ef8c1987d2ee306c8303d913ffd78adabd 100644 (file)
--- 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 61335b03f9dd7e4488aa8314fb131e0754eb51f8..88db3b6d77abdff7eff4fd4bfe2e6992967c2416 100644 (file)
--- 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 a75f33bc8c4f861d82db84d469d9df1ec665ee14..b080f2f63bdcf33409c1cec3af25cb7e7b7be201 100644 (file)
--- 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 e206822db52fa75c95b56020ca975ba97843a59d..ba5ff3bbd73c28ae266e7163e062040a840142cf 100644 (file)
--- 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 c18c85beb6b8b4db793acb8e2d09bcd3a9bc189f..45f1c5c334a091f8fafb2547ab82e345f6c38c25 100644 (file)
--- 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 e52ca5b0d0ed453b00f969f16f7a215b18faebf1..8ebca33f49a2f340bb8564bb843aaa52ae062e36 100644 (file)
--- 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 456110731e24f20bc68b3fc9c2cf303f3f20b19e..e5b6d578df78ffa79534e32c8ca1e0a315e5a471 100644 (file)
--- 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 d515603a648930284bf83f92342dcd05268fc1ff..afdae833e9dee9996653b6a0d5cda8f42afc990c 100644 (file)
--- 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 6cd1deece7151097bab5b70e0fca676e68673660..74306f972955a38475b458af14557daa2176da97 100644 (file)
--- 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 c04aef5cd4f5cd32820e28da724365b530b5246b..0a4ad36e7b496833fefb7967039d9e89c012e842 100644 (file)
--- a/src/ConfigParser.cc
+++ b/src/ConfigParser.cc
@@ -33,7 +33,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#include "config.h"
+#include "squid.h"
 #include "ConfigParser.h"
 #include "globals.h"
 

diff --git a/src/ConfigParser.h b/src/ConfigParser.h
index 99fd894a073f12bce4e112b93b3c122954444cae..f4836a00d9e66a7688d6850a4520c55b7deeffc4 100644 (file)
--- 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 ca061a8ec4f32c05af406499fd09adfcae7998a9..da5274a06d5ca03b2076bcbe3d5c77b4a9822914 100644 (file)
--- 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 36b2f2aedad05671b004f51944d1db076daba1ca..b4415a6b8093a0247398157e699c8d55b39bb32e 100644 (file)
--- 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 80e1406357951e986f31d5340db6ad989415b0c8..3cd3dc86977e1901406f6d495c8514a21beac21a 100644 (file)
--- 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 c7722c86da12050f6e516558e6b0470100844125..5249c55f16aed99c3f754f6187694d6111d21a73 100644 (file)
--- a/src/DelayBucket.cc
+++ b/src/DelayBucket.cc
@@ -36,10 +36,10 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 9f3c1e76d9c1294e565f51f5bf5d77d76efd3bb9..43e0bda5d2a7a44864f63152dd2bb08a35a241b6 100644 (file)
--- a/src/DelayConfig.cc
+++ b/src/DelayConfig.cc
@@ -37,10 +37,10 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 08dba5dd18d46d502e3b4d4fdfcc697b5b4ce988..66f52ca4d6f3cbd1bd2bbc04955af7625c731953 100644 (file)
--- a/src/DelayId.cc
+++ b/src/DelayId.cc
@@ -37,14 +37,14 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 34138ccbe6a74ee2f7079a5ca104be70533a8a91..3f12c0b104ba415f71094314e7a8cac5c1647222 100644 (file)
--- 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 b4871ecc098173dd021f615e98d17b99beedf6c2..2fed607dbea15be93030ec70d204d8f5674fa8fa 100644 (file)
--- a/src/DelayPool.cc
+++ b/src/DelayPool.cc
@@ -36,7 +36,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#include "config.h"
+#include "squid.h"
 
 #if USE_DELAY_POOLS
 #include "DelayPool.h"

diff --git a/src/DelayPool.h b/src/DelayPool.h
index 22d2d73dbfa8227231d3822619cf04eb6c023af5..432418bf2ef801242c61dc3f82c436e7749f53c2 100644 (file)
--- 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 485cdc34e5474103982176d7052d706b9e6e2f5a..5481a4c24ccf8144e2ecdb530ad2daa0b15279aa 100644 (file)
--- a/src/DelaySpec.cc
+++ b/src/DelaySpec.cc
@@ -37,10 +37,10 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 5e510a462017567c920101bd0ef72a739ed39ff5..586816bd1283f9fb1969c244d77f71532643ddda 100644 (file)
--- a/src/DelayTagged.cc
+++ b/src/DelayTagged.cc
@@ -35,10 +35,10 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 6bc7ec6439afc0301b3816653b768d7a12fa6221..0335e34ef9b9c1b45267179ec1b6fd53862a2324 100644 (file)
--- 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 81eb6245ad63f1a8f81da777667d12a8c38eea94..ea72409d5f41c5626ec105219970b027c70579bb 100644 (file)
--- a/src/DelayUser.cc
+++ b/src/DelayUser.cc
@@ -35,10 +35,10 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 0210e343fb1e9a3d93ecb91917e01923b74795fc..92fcadc687940228f88ac401ed835d6145780e4f 100644 (file)
--- 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 0f286446a813c21a4216c315404ed3b584c7fdac..0d434ea9c56ec6738a60ff9da68c4fcb4fbf060d 100644 (file)
--- a/src/DelayVector.cc
+++ b/src/DelayVector.cc
@@ -37,10 +37,10 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 f6fa19abc9ab44207e2a0a391c2a199f9688e435..18268dc0f2d8e5fa07694943c0b2cfa572c70e4b 100644 (file)
--- 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 b839a0962a7f0f89a7d772e6ca47440b7d6666d8..8e99dfb823d5b96c52bc612768ec8fd8e3489124 100644 (file)
--- 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 99be575f2877186d5e06d04429c18c848899273d..fafc127ff044a2f18f7eb153d9b007e99a05a350 100644 (file)
--- 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 9a7811f0026673b34f739e9ec1d114791eab74f9..54cd745d0dad215b6b029fa0e0fc411d90eabccf 100644 (file)
--- a/src/DiskIO/AIO/AIODiskIOModule.cc
+++ b/src/DiskIO/AIO/AIODiskIOModule.cc
@@ -31,7 +31,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 7a946375f8560db57980cee50158a0e5c77b4c2c..60847b48319cf91d1ac5d7a36927ab540b3eaf76 100644 (file)
--- 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 6f31515bef5af8c18b977b330017cb183232c575..399854f0835b58b0889105a5dd56cdeae302d494 100644 (file)
--- 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 c446359f9442509d36b48162826cc7b6a56b5914..b1dce0a4f6c5e3e78f514af771f46e3b91d96fad 100644 (file)
--- a/src/DiskIO/Blocking/BlockingDiskIOModule.cc
+++ b/src/DiskIO/Blocking/BlockingDiskIOModule.cc
@@ -31,7 +31,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 d4955ee34709e0e9ac9ea7b0d8d548c8497fcbc8..fd92024a48cc55d9938c436edf0c2bf0abe8bd20 100644 (file)
--- a/src/DiskIO/Blocking/BlockingFile.cc
+++ b/src/DiskIO/Blocking/BlockingFile.cc
@@ -32,7 +32,7 @@
  *
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
-#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 86100375de52f246f93e9ec1220b26e2cbac428b..7ce57af323cbc58a373e9f05a3e89eea4e006fa1 100644 (file)
--- a/src/DiskIO/Blocking/BlockingIOStrategy.cc
+++ b/src/DiskIO/Blocking/BlockingIOStrategy.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 489a500cfb485c738b62165e536a7ab8cbcb914d..e8dde4e60192568cf079aed20973faf98dae6a8e 100644 (file)
--- a/src/DiskIO/Blocking/DiskIOBlocking.cc
+++ b/src/DiskIO/Blocking/DiskIOBlocking.cc
@@ -31,4 +31,4 @@
  * Copyright (c) 2003 Robert Collins <robertc@squid-cache.org>
  */
 
-#include "config.h"
+#include "squid.h"

diff --git a/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc b/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc
index 4e482996d67a0a102bd59501930d02c95b75f5b0..8d1cecdac888a7ce680ae0cfee7f208694004e78 100644 (file)
--- a/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc
+++ b/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc
@@ -31,7 +31,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 95743e10df65b103707637a541a8fec251a02184..1c141eae5f004a258a3dcf3de5234d149a7a56d6 100644 (file)
--- 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 021e10a70cd4ae1c7a0b03800962ae4d5df8b4cd..af376dcb8cb5796766eb93351dd046a33fc95e6c 100644 (file)
--- a/src/DiskIO/DiskDaemon/DiskdFile.cc
+++ b/src/DiskIO/DiskDaemon/DiskdFile.cc
@@ -33,7 +33,7 @@
  * CopyRight (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#include "squid.h"
+#include "squid-old.h"
 
 #include <sys/ipc.h>
 #include <sys/msg.h>

diff --git a/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc b/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc
index b509722ae0ad94ed08d0b8e055fc9639a3ed766e..1c0b937e5bcc25ff7c3e2a6e43fc7dc3820b1ee9 100644 (file)
--- a/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc
+++ b/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc
@@ -33,7 +33,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#include "squid.h"
+#include "squid-old.h"
 #include "comm/Loops.h"
 
 #include <sys/ipc.h>

diff --git a/src/DiskIO/DiskDaemon/diskd.cc b/src/DiskIO/DiskDaemon/diskd.cc
index 3dfbd4e7f204b32f0e731680837dd6f6f423909c..4f225531c1398c58f082767dba43741e5d622c5d 100644 (file)
--- 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 d5f542d45fc96904355da05db36fc89eca8edfb6..4a0a668e3faac46e21efd796f9fb35326071333c 100644 (file)
--- 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 48a58c9ced6164f75f1e6d0d26375e53abf18bcf..91c84e3f4238c8a96bd080a9e658ddcc29d61ddd 100644 (file)
--- a/src/DiskIO/DiskIOModule.cc
+++ b/src/DiskIO/DiskIOModule.cc
@@ -32,7 +32,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#include "squid.h"
+#include "squid-old.h"
 #include "DiskIOModule.h"
 
 Vector<DiskIOModule*> *DiskIOModule::_Modules = NULL;

diff --git a/src/DiskIO/DiskIOModule.h b/src/DiskIO/DiskIOModule.h
index bf508d3a831ad5126fc3c3cc54ecbe1c5b32d68d..4dfddeccd3ac1f86f43c557e428f71a069738ea1 100644 (file)
--- 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 91990d2e46ee3d5c5ff32a60a35992213af066b1..1f1c8d5bd8814e5392367091b8f1ca894d1e93dd 100644 (file)
--- 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 4bf6accf334e397024aacdfd380f1ba372cd58ae..19cfc6222cce0a0f761bf9d72b2ff889648e621c 100644 (file)
--- 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 a5bc030b3506f26a2fb65a335fa52cd3ddefaee1..fb2509a5c98d6ff6cc69e82c588b48280473a132 100644 (file)
--- a/src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.cc
+++ b/src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.cc
@@ -31,7 +31,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 c885b293083671bb10c678a1f70d3df689866e08..e490f392c94bd0ffb251afffc9f8d1ff8476c7f2 100644 (file)
--- a/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc
+++ b/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 58ada87eb4594e0db97e67299a105a67bc436be8..1cf652c03f7e6213242c2283d6d013f5eb7a524c 100644 (file)
--- 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       <stdio.h>

diff --git a/src/DiskIO/DiskThreads/aiops_win32.cc b/src/DiskIO/DiskThreads/aiops_win32.cc
index 7fcb2526ae53620fc2cf5d3d7d10c90c415889ed..5afce973a41223d6aa2f8986054d5a101c8413d2 100644 (file)
--- 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 f5a6f1c0bc1b68baa6a096a1fe1d646a0fcd4754..f0f56a51ccbd99ec795f112dd4ce358c5d8dd365 100644 (file)
--- 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 a0006547b8a5efbd67f9d4b302abe55757475c90..739fd0dd7e0c9f1cd8543fd3ce95578136e8a4a1 100644 (file)
--- 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 d0878e43e7798b31a16a62eb1dcd11f93b915838..5519da1e110f68c01e657f3a6aa9065cc3676874 100644 (file)
--- 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 becbf2e9d3e81c568fe2e694ab8f075a09a28a5e..30f9c585f7da132e9f86e0c727ff21c16dd59c31 100644 (file)
--- 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 dc3a191ed83fa9702dd324300b615dc5cf88e0ee..cc38d791dfe374a86b62e924328d4c83533fb5a5 100644 (file)
--- 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 841800446ed09d125ca931aa97e0f1e8dd668529..4d1b1954942272a1384f045da64b2da5644bc247 100644 (file)
--- 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 372aa869b985d3fba6a6b890d8c3a8e3a4afa527..0b54105c6b1c49609d2ed41b66b08bf0f6d4ff66 100644 (file)
--- 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 3f6d68184a9e34ea6e4a859cf8069cda3ecf4dd1..6c6a013f34d032280d6d6c3a4940ee3c3bea30e0 100644 (file)
--- 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 91eaf59ebb9a0501bfc5ce3aa27663e1746cd51e..edf9dd273a1a49f93df77686d0082e9c71b73c76 100644 (file)
--- a/src/DiskIO/ReadRequest.cc
+++ b/src/DiskIO/ReadRequest.cc
@@ -31,7 +31,7 @@
  * Copyright (c) 2003 Robert Collins <robertc@squid-cache.org>
  */
 
-#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 cbd8bbfc9516e79d4fb7389897e5d32292899844..87d4be34177892462fd76e631bda0470d9b4828c 100644 (file)
--- 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 df47385e4c8e535035393cc3e7e18fb03bdcfcd4..8c4a753067e2d9c936cf7c8a13b1e8b0af7531e5 100644 (file)
--- a/src/DiskIO/WriteRequest.cc
+++ b/src/DiskIO/WriteRequest.cc
@@ -31,7 +31,7 @@
  * Copyright (c) 2003 Robert Collins <robertc@squid-cache.org>
  */
 
-#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 f41a925f0ab6e3ce99e792d92a79163614e9befd..b36b75dc03a79aa85065ec99e0b719ef3856cb41 100644 (file)
--- 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 8f1f061cf6060da86c19bcb6fa789f156d1a624b..435a785af3c5cc1c10290a74b5d338c73237bf5e 100644 (file)
--- 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 b2307b3fa29da2d58c0abe085d6066bf672ea990..ee49a7b292c3c154c5b2e35002d9587c6a08d0e0 100644 (file)
--- 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 b281adbc22d6420d26daffa9915dbf3d30b564fe..15b7d14b54b683f6cd33f5dee0326f441623cbe2 100644 (file)
--- 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 d709a147238fff7bbd16fd6f1a5796a061ca33a8..75df854269818bbbe87ada299ec2a8fcd3f0b989 100644 (file)
--- 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 ade17e63b4670356ffdb436ddea7114c7c8dc5f9..9c7d2dde3bd7121f3178380d8c125548b0c24b7f 100644 (file)
--- a/src/ExternalACLEntry.cc
+++ b/src/ExternalACLEntry.cc
@@ -41,7 +41,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#include "squid.h"
+#include "squid-old.h"
 #include "ExternalACLEntry.h"
 #include "SquidTime.h"
 

diff --git a/src/FadingCounter.cc b/src/FadingCounter.cc
index dd6364941d8957ec3db8c956768115f2d3cfeb76..aad8cdae4d221c5995145b89bc9b387299c90578 100644 (file)
--- 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 71c00442fe4b1d5edd66392e1d48b1daeb36f522..ef6826b076a34a1be64ae008a894c4838fccc514 100644 (file)
--- 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 110d282d56f7209b391bba18fac9ce80f20f747d..caecd9e59fc97be678d5457fe4ca4c70c4f2a69b 100644 (file)
--- 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 211402e6526b19317d757e51d446a9bf9eb3066b..4d86e7e461c9fb8ac1e255bb8f351de14184f6b6 100644 (file)
--- 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 c0af6ad673cfe1a901d710d4fa9ab41b874acfe9..85fdb4fe8fa3b3c691f21f42116b9d749c9e2086 100644 (file)
--- 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 401b46c1369d661ad61ef174ad4e48d4c9bbc454..f43b7f62f02998c55255b121e7896b07590b104a 100644 (file)
--- 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 bf46d1ead8427288127ff847cce3d885181f3599..1b554518bd3e5bbd26d42f0cad870358d47ff338 100644 (file)
--- 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 aac03689ace6cdb73f8afc3f906b30071cb8bb0d..cc9571ad6c4892e23d57416883d23f85415f365e 100644 (file)
--- 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 e7e8da3d5a49ece6e981eb97cf694e8eae0235c9..cf398e7f23e49fbd8c06d3fadf894bc5cd9c4a3f 100644 (file)
--- 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 bdbd551a40896f87884decde28dc4b79f332e51c..3e0ef255f7ea4df718927949102cd4b5a5c4e538 100644 (file)
--- 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 bd0e7a63d119a2f41515b9ee63f8b8fbbc39916e..d18a75fee4c2f15413e15e4fdb25e81daef836e0 100644 (file)
--- 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 4f78ec803141b9c8b4dde9aae514d3085d2ec2ff..ce26868a39fe0b30ef71d6e1900f0e0da7b4974f 100644 (file)
--- 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 79d314430afa3dc41adf22700a686ae2107a1ff5..2168b4f499dd9c78f5e3682c0944654d02d2957a 100644 (file)
--- 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 91a0e3c43b8af0d4b45adcb9889a2d948cf9d73c..1bdbde357fece014a4112550886be52a404192d9 100644 (file)
--- a/src/HttpRequest.cc
+++ b/src/HttpRequest.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 d98f3a9f5c89f9d9d12066bd68eb5a06c98b5f56..b624e2fdeeacf5e97817e1aaaf5d67140b261fc6 100644 (file)
--- a/src/HttpRequestMethod.cc
+++ b/src/HttpRequestMethod.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#include "squid.h"
+#include "squid-old.h"
 #include "HttpRequestMethod.h"
 #include "wordlist.h"
 

diff --git a/src/HttpRequestMethod.h b/src/HttpRequestMethod.h
index 873aabcc249924a67999e7c8232170ce0f22fc14..7a7d16de190daaa2179680441ae2f415543a1b82 100644 (file)
--- 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 <iosfwd>
 #include "SquidString.h"
 

diff --git a/src/HttpStatusLine.cc b/src/HttpStatusLine.cc
index eda2844c812f6204b8794b7223f1beafdf88b02d..5b36b08df58fe87a3ae1c91074f09907303954f2 100644 (file)
--- 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 3f6e1ed95722feec051500a018c6cc33a324352f..d66ff2824748d1253a4e0bf0d1f580eccf95dea4 100644 (file)
--- 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 996797efc3e84c7c2f2a8282b51d579f627385d0..3c62b410829ccdf2bfdc173594023a3c9bca3e0c 100644 (file)
--- 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 e4dc3e19979aeaf6458815216f0ef1089e045ee0..5dbb8f1bdf1c2d6c9378bc00438074908ff42f25 100644 (file)
--- 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 fda261dec96d8249092de65916af732393ab5610..e90536c2798cabf4428d8fba0f02cc49deeefa33 100644 (file)
--- 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 6316d02e7d0ff1ef54b7dc8864a4d6e6a5602b83..b50d3d4f0db5861e1a3fe3c7a38161809153555d 100644 (file)
--- 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 46c5ec1fc6dbf6ffbc6a84b8258c09cf95bd466b..13ffdefd82ea36ef67771b88af71b7be84a678b3 100644 (file)
--- 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 373a3db0c1d17eb1947303636b38d1d941314ec5..b35d26cae619f7c153c521851950940a2ebce921 100644 (file)
--- 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 f3f31af3b33a9a02de9de20a8c79ca50333b0d5a..a0b6300de6c78c3599b50d5693369e6df84ee0fe 100644 (file)
--- 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 87c22e688eee11383b37093fd5d65cb22301b113..97580eaa8e2a992be16e2d7685db348615c5c599 100644 (file)
--- a/src/NullDelayId.cc
+++ b/src/NullDelayId.cc
@@ -37,10 +37,10 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 6efc3fae62dbf14767f0f2a36bc9f961e0fd4bc0..c66f3ce7e1f258e3dae34c35e065773c88afd8da 100644 (file)
--- 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 4e50d1a5ad468c6c456d5a24a8e49a8c30caea26..a46e0c70d7fdeb1f3e123905060228817bb27571 100644 (file)
--- 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 e0371fc145c04972a1e9294a39c772145ce8e062..0058ee77a8a7738d9f8f30a242aadcb293c47d1f 100644 (file)
--- 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 2b78a0ca75b7bcec9a00fe31de692e6aeed5ca6e..259914d6340ffbf0d81e1bfaf729e47d702ce588 100644 (file)
--- 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 6eb7aeb524a4e5cd97bc82e5f2d4e6dba1e9e354..696dc8f3778a6521ca2881d2ed511ec8b6c97853 100644 (file)
--- 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 6a311dcff069c31b438723be845ec99e153d67e9..ffea8a220e29087a654e0ecfc648b595355fd20d 100644 (file)
--- 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 c24e340b0bf71c631a29c40519c8acb9a18ba37a..9fba35322666525159c050346e7eb674cbdcb493 100644 (file)
--- 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 de8a58d5f18b0523cd485fe55277b1205301a432..437c9c3a10fcb85fbbf56b3ddfee1812b2a530b8 100644 (file)
--- 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 276498b8160b828e22052476225da7d7a5a1c24a..0b78ef00675be7815674ea36db31d04d4eb2d8c2 100644 (file)
--- 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 13e1d76adcb57a2a5ccf975f3421e5f1d2ddb603..beffab6a461875de617b311f77316b3607b38758 100644 (file)
--- 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 0dc94e2e11c8107699cbd7f03f73bdc67e5836cb..24104e239b5af07dc9a579135837e0a33f496d84 100644 (file)
--- 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 b4160ba6d1f452d369d7c4488300bbcc2fef27d3..8a56d1bab5306201b93e5171c4712ea89301627c 100644 (file)
--- 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 22aebfc71ef7223f503662121898dfee9f132aa5..b742f89cda78469f873288667ebe82df594a6015 100644 (file)
--- 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 3091f520c830696dd9f202f385b09f1f79844ea5..34379fa2509915f26fba40fec3675fc74591278b 100644 (file)
--- 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 f760577aed5118270029fc2f2d39868c1fcb704b..9e5d0ddcc1bfe6383a51599c8f1650468f562cf8 100644 (file)
--- 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 30d0a6b4de8d1caa70d53aa7db3ec03b49a1c2fa..38c51e2cc0f2672d83befb24537e1854bb6084a0 100644 (file)
--- 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 b76ba15b8f29f00df95f5442a8e95fa07d7c5837..13e06309cd371be7e96ee4b2165f1e9b8e366b5c 100644 (file)
--- a/src/StoreFileSystem.cc
+++ b/src/StoreFileSystem.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#include "squid.h"
+#include "squid-old.h"
 #include "StoreFileSystem.h"
 
 Vector<StoreFileSystem*> *StoreFileSystem::_FileSystems = NULL;

diff --git a/src/StoreFileSystem.h b/src/StoreFileSystem.h
index 586ef6113d14550b7f184ebddc2bd37c41bf7e23..9ab38a5c19e31ab151f88ec33d1106f4f2f3eab4 100644 (file)
--- 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 9d7538ec28f7d0839ae894b5f73d2fc8b8fe775a..0b18537e094179fbb0806f52a51d7c90d1aa1152 100644 (file)
--- 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 f784a8c2099ff2bf9c059334c8a0a7512ab3c393..bda815620764f1296075c1af923cdb49a618ca32 100644 (file)
--- 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 4d6bc43754f67228fc10c62c3b424ae029696568..2325f1e9cf2f5e686fd526d9d1c90904fa816c9a 100644 (file)
--- 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 236755b2c9c78d8381ea44c0d0bc9a7cf7d6049f..78033e835bd09c4b1e1610193171f8d3fdd5bd27 100644 (file)
--- 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 da982ad7fcc6b5a47684e84a1afc80287cbdfb79..58ff433557990d8f70e3b827090377d86647c471 100644 (file)
--- 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 65cc0cffd2b59d068d67a4735d82369959bdc649..67278a363176b6e54635b6917ea1250be67298aa 100644 (file)
--- 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 855a4b4400e03db17f3044908ce79ca231209baf..bd42702fe805ebf1ac2260b399f1b3b0b44858e9 100644 (file)
--- 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 1563028e035cb18f78dfd426ecee8cfea8112fe9..0c40c8a9d4f1af95199f8c0bc6512b05a1f882ce 100644 (file)
--- 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 2361a602a094886902abaf6d37f7eccb6220ea51..ed0af92db79fe81a03580c1682ac1dd4fabe7a9c 100644 (file)
--- 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 6541542b19d41c5390c51b78c221b3cc917c0f4c..ac950e1fc2939fa5fc555039379e189711a2db8c 100644 (file)
--- 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 24ae5211202715dac2a3dd3c0192755f93964112..fb1e50fb172a8524421884ac2c5c714ddfd48595 100644 (file)
--- 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 5fad46944fde8b61231e9a0d9696e365d7d8da9b..abbfb766d803deaa20f8806baebb15e0b5c21114 100644 (file)
--- 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 e295d521ef2f79e4ce249e6e68b1ec0034e24163..a1b2604a6f7a64379c6db6b64a22ac802d3fff2c 100644 (file)
--- 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 33b5a4dadae6ce06e706412a3570c560c2487a86..43af800a0cd0c7eead25c1c18073b0dd507dea20 100644 (file)
--- 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 66aef0225e02056b3e8ae2580e1f2735136d50a7..b79de5f7f1e1060ff9be8514927d5a0fe82d9eed 100644 (file)
--- 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 2b8b7eaf34ab640c9e2e855337b32aa6b8ce8432..5cfcbb62198de8da627a53ee1e8c755486d36391 100644 (file)
--- 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 39ba89ba1e92eeddd4c0a91643e940ee9d808f63..cb8e923a70df3b8371c561d8003168ef8d707be4 100644 (file)
--- 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 81e2abaf007ba9da7d3e2c1980aa1200fe3e580d..bccbca1637b4774fdc77059f06b89b150b3acc11 100644 (file)
--- a/src/acl/Arp.cc
+++ b/src/acl/Arp.cc
@@ -32,7 +32,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#include "squid.h"
+#include "squid-old.h"
 
 #if USE_SQUID_EUI
 

diff --git a/src/acl/Asn.cc b/src/acl/Asn.cc
index 05c5640a9791bcb10be6b0ce5e1337c50b2e8576..bf54622dbe125dcd9acff1a2147c9c5ae9f78f95 100644 (file)
--- 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 02fa8dcbabe5d82b96300bb858fba39ecaa2fb76..31ebdded92e57d4cd49319a2ca034199cc181eaa 100644 (file)
--- a/src/acl/Browser.cc
+++ b/src/acl/Browser.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 32c51f1409ca1014215d8ade63b2c1949cfa77de..76f362c4980f0129876f477f24c2d656c56d51bb 100644 (file)
--- a/src/acl/Certificate.cc
+++ b/src/acl/Certificate.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 9921732d6db27d76505944111b941ac821d0fa3d..cb6a5f25d4ff3a4624358a255f58798314afa676 100644 (file)
--- a/src/acl/CertificateData.cc
+++ b/src/acl/CertificateData.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 449f383422892bffc2a434b438c37fad4884e46b..496dbf922890ada435d06a7dedca46ddc4878a54 100644 (file)
--- a/src/acl/Checklist.cc
+++ b/src/acl/Checklist.cc
@@ -33,7 +33,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 c5836db5aa6980ba4d6084400a768dd12f12febb..55c267b41aa550afc9dfbf61af2666e8cfd9a1d6 100644 (file)
--- a/src/acl/DestinationDomain.cc
+++ b/src/acl/DestinationDomain.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 0de76f0537007fd62cb21342e37d288521bb449e..3255650678fc322d8af9c308c1af9b008cb89430 100644 (file)
--- a/src/acl/DestinationIp.cc
+++ b/src/acl/DestinationIp.cc
@@ -33,7 +33,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 411bc440798893383158b1a5dbcfabb223f95905..b435e5a944fbf8c4ae9e384ed14ef0ab66666b90 100644 (file)
--- a/src/acl/DomainData.cc
+++ b/src/acl/DomainData.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 cd86c4cb215351730c76ccd202bae157248c8eaf..26c56affb4a8c37ff133767a9238bde59fb8ae21 100644 (file)
--- a/src/acl/Eui64.cc
+++ b/src/acl/Eui64.cc
@@ -32,7 +32,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#include "squid.h"
+#include "squid-old.h"
 
 #if USE_SQUID_EUI
 

diff --git a/src/acl/ExtUser.cc b/src/acl/ExtUser.cc
index a13aab72430a2ba5cf52bdacb68eebcb37cf4a35..72e4111db38322ccb1de2c9c013ff661a13874a6 100644 (file)
--- a/src/acl/ExtUser.cc
+++ b/src/acl/ExtUser.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#include "squid.h"
+#include "squid-old.h"
 
 #if USE_AUTH
 

diff --git a/src/acl/FilledChecklist.cc b/src/acl/FilledChecklist.cc
index 186cb8ab692fda1a9867153a04fabab2ae835fb4..16d6f276603a88aa264141716bf8978a65062426 100644 (file)
--- 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 ec11433f5df2c204c22891e5ef362f6fb62a2f2b..90c5eec138b8d561c3483b15593c4bfc9e6b4c4b 100644 (file)
--- 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 70bf4f41abef02831576969273beb17adda9d67a..c44f60391e490926116748c5c3ab427aa3a0dedf 100644 (file)
--- 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 3e5e17cdea1274994344ee43e67be746634333cb..7345bc417d04f0089564cc0a864aedccd9a58b2f 100644 (file)
--- 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 e7d5f3df448e3a45d320394a29a3afd73504f7fe..9db21b5762a7771f15237cf915534a7148a71458 100644 (file)
--- a/src/acl/HttpHeaderData.cc
+++ b/src/acl/HttpHeaderData.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 89ca1ecb05928bf699665519581e34911f86a351..6fba27437bbdb3f60941d722448587deac7d0516 100644 (file)
--- a/src/acl/HttpRepHeader.cc
+++ b/src/acl/HttpRepHeader.cc
@@ -33,7 +33,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 169d338356300a3f44698b87e6a14f89bfb56ebb..d9d2259030cfbe79b925bc3f1037710ee9fd686c 100644 (file)
--- a/src/acl/HttpReqHeader.cc
+++ b/src/acl/HttpReqHeader.cc
@@ -33,7 +33,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 2514a8cb3fb95d1cecdee75239301d6f852755ec..0d4cee4c867859f743dc0d68dab6108a34b2e02f 100644 (file)
--- a/src/acl/HttpStatus.cc
+++ b/src/acl/HttpStatus.cc
@@ -34,11 +34,11 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#include "config.h"
+#include "squid.h"
 #if _SQUID_CYGWIN_
 #include <squid_windows.h>
 #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 a8fdf0d7294f6248a16998565393df1471683106..a985fc70f02ff98608e0ce8654ef2fccf00b557d 100644 (file)
--- a/src/acl/IntRange.cc
+++ b/src/acl/IntRange.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 a1e2ffd811223a0906d0ddbdffbd3a7dc88bd6e9..b1c05c360c5b631dfad1ef8c25107f6c6bbfdbab 100644 (file)
--- a/src/acl/Ip.cc
+++ b/src/acl/Ip.cc
@@ -33,7 +33,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 ab04b796eeaf3f620c643ff6cf76f53b7ff5cc41..b5ffb359e2adbecf6f4d8d556d48f115b61649a5 100644 (file)
--- a/src/acl/LocalIp.cc
+++ b/src/acl/LocalIp.cc
@@ -33,7 +33,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 bf640cd9e02391e04f75c3ba5c4206a6d326fe30..33139670fc4b572b166aa3b248037ce5ba60d8f3 100644 (file)
--- a/src/acl/LocalPort.cc
+++ b/src/acl/LocalPort.cc
@@ -33,7 +33,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 c7cafe4fd6f6faccd63589bc8d99c7b1f03ca290..81a848aca0c89e3f1ac04a8d85db5acec78d8ea7 100644 (file)
--- a/src/acl/MaxConnection.cc
+++ b/src/acl/MaxConnection.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 5039967ee4950ddd6a016c5e8253f8de577f09e0..25574a27264a8a5d9e7b391e73cb9c3db824097a 100644 (file)
--- a/src/acl/Method.cc
+++ b/src/acl/Method.cc
@@ -33,7 +33,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 a5347442a5dbb602a45e4b49b74bbd894d844ee2..8d43522795ce239a41e4463431ed5169a8cfe095 100644 (file)
--- a/src/acl/MethodData.cc
+++ b/src/acl/MethodData.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 75d384473a89b6d819f78711b89205cb102a2d38..7eeb7f081a1abcc9b14f52f916f30a29d43d2a94 100644 (file)
--- a/src/acl/MyPortName.cc
+++ b/src/acl/MyPortName.cc
@@ -33,7 +33,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 55bd41ccecb15643810f42f406c21820efcb7b49..91f496229c11d78a018a863a9b8eec9d472a7be7 100644 (file)
--- 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 6d0a4e0a6e671c721693827fc52b61d3049fc0b8..76646cfb9055dcd3814e80a92cd525e6a58e239d 100644 (file)
--- a/src/acl/Protocol.cc
+++ b/src/acl/Protocol.cc
@@ -33,7 +33,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 7aba10769c3e2eb45ca414b46ebde41304affad1..8f6838a7a58b570432df6fb4cb92afe985e349b0 100644 (file)
--- a/src/acl/ProtocolData.cc
+++ b/src/acl/ProtocolData.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 b43e0790c131b38d8fab0407b21d7f6d0c43c53e..20ac84cffdbc8d1fc5d4e554aed866ef322784b0 100644 (file)
--- a/src/acl/Random.cc
+++ b/src/acl/Random.cc
@@ -32,7 +32,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 415903aa6a6f2756a87f0adbe4a9557c75a33939..adf1876513963a7cdf50da8d7e2456de1384888c 100644 (file)
--- a/src/acl/Referer.cc
+++ b/src/acl/Referer.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 1ae1eb437a7c51dd4e0c6b26cc7b146c03ddf567..2138e46c4d0b2dcece7c25a17bd8052fdf80c829 100644 (file)
--- 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 265be3efeb18c05a845cae4dec8dd7327814e4ba..13a5c7957dc38b2598b43d2a9c9944c7489de75d 100644 (file)
--- a/src/acl/ReplyMimeType.cc
+++ b/src/acl/ReplyMimeType.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 d7f96dd3f30d6c64800ad092cb35b97c4d4616c3..153796250cf2a32b2208d33a2067c6df5d7622cb 100644 (file)
--- a/src/acl/RequestMimeType.cc
+++ b/src/acl/RequestMimeType.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 322c4f7efcc916dfec3d87519fa5f1ca2a1b3990..ace22a3a4273a7fb943cff03312edd79fb36b237 100644 (file)
--- a/src/acl/SourceDomain.cc
+++ b/src/acl/SourceDomain.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 654dbade07b1d88f1c7732f87f7968f6bf4ef774..834ab282857ca86ca4484a902a75fdf6aa0051b1 100644 (file)
--- a/src/acl/SourceIp.cc
+++ b/src/acl/SourceIp.cc
@@ -33,7 +33,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 33041e6d1767b7ff7b036b8bab030811a891f8e6..c729a1f42437b32303a58964989feeb5c4dc13df 100644 (file)
--- 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 820ed646afdc4545c064ed6b437f5aafcf34ced9..da4e3398add13a4af151839cbf7565419722b1ba 100644 (file)
--- 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 278d8f2ec52483eb51dea3c850cf768e4890c8fd..bca4792b76cb9a47840354e50a16ca6a9e258e1a 100644 (file)
--- a/src/acl/Strategised.cc
+++ b/src/acl/Strategised.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#include "squid.h"
+#include "squid-old.h"
 #include "acl/Strategised.h"
 
 /*

diff --git a/src/acl/StringData.cc b/src/acl/StringData.cc
index fa9265037b9945def9dca5c78c072e6330a65276..ea71c016acfdc4489af1b00c56f628fb7700fb17 100644 (file)
--- a/src/acl/StringData.cc
+++ b/src/acl/StringData.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 ef4ac006950c85f0ffc345d125c7167b205a8e5b..79e919e5b8ba38583d7acc94510616ea2c90120a 100644 (file)
--- a/src/acl/Tag.cc
+++ b/src/acl/Tag.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2009, Henrik Nordstrom <henrik@henriknordstrom.net>
  */
 
-#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 d4007ec071edb2f55d52774d6fc91ec3c9a56b3b..7a871dbe03f21224512b2c157ce087e41ab6b308 100644 (file)
--- a/src/acl/Time.cc
+++ b/src/acl/Time.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 f90a269d13675acbcb18da2f3616ef8cd4ad8d85..78771ccd71bbff663fcab022a37b3f8bf04f43da 100644 (file)
--- a/src/acl/TimeData.cc
+++ b/src/acl/TimeData.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 a7366b6a5512204e80e72c6d6138c5d911d73d0f..53bba00c9322a84b2c206c6ab915d06be16163b6 100644 (file)
--- a/src/acl/Url.cc
+++ b/src/acl/Url.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 cd1a8bae52ee9077df375b1ed039ab0584aa06e0..792a7015a0f18b3670ced44efab6cb832eb154ee 100644 (file)
--- a/src/acl/UrlPath.cc
+++ b/src/acl/UrlPath.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 e575c563f8107dee26ddceb17362eff8a12ef321..9078da23f68468929f98c6ab6931549423dfc58b 100644 (file)
--- a/src/acl/UrlPort.cc
+++ b/src/acl/UrlPort.cc
@@ -33,7 +33,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 80df73e35f0a5beaf1cf62c656c41b93c7325b5e..4e1e732f0f2323782a45da16984c0f2416156fa1 100644 (file)
--- a/src/acl/UserData.cc
+++ b/src/acl/UserData.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 a8b9c2bcbbb279eb220779f24c1608b1ea73d518..9a8ead819d5dd4fbe869b70e5a8a84cafd97bd25 100644 (file)
--- 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 2aa3c97ed6b03cd308e13abe021ff2200c42940f..1a5b3bd403aece01cee9af1e053702166d38dc48 100644 (file)
--- 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 dc3daaccdf2d32d187d87237997b3cc3cc8d297a..cf80ada19d97b109ec541aa4abe25aa101b73170 100644 (file)
--- 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 7ce5813a05844b1633044da5e95750658fb91efe..17a1d79ef915294cd5d5284e08897cd2786195dc 100644 (file)
--- 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 9bcba5c0b3c7612cb469ed8c721a1818094cbee9..f5ebf4a3d779f5b348f459cdf08d4a81db2e7590 100644 (file)
--- 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 613ea0ed08e7bb0c4d9e5c9b6e6e10cc1b477bdd..8d55a4f36e77362274177deaadede5299ebdcfbf 100644 (file)
--- 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 97ea84bf5b1367c393f05c5075b8b0b7bbcb12d1..ab58961b3e3afa7fc0888384da6af67aefddc4b5 100644 (file)
--- 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 c40dd5bfb95dcd1fce08cbb43f6efda0ac6390ca..38d29f0bab7fafd31fc5c0fe073da677970513e9 100644 (file)
--- 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 511e3437dfaed7443acd5489a67e6e7620fab5f0..af6c481b0e570f863f7e41af52ca4ff6fcd8cbdd 100644 (file)
--- 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 74b713dfc68b1a5238f525ff38b27796d57ce9d3..47dfa34bb1a91900e5179d48ede184d083897e74 100644 (file)
--- 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 dd5ce3867fbdfcf405a7d73502d1f6262a7f74b3..334a0f318bd1957cdb2b84fcb4961239850a523a 100644 (file)
--- 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 dd297d8a91ae0682b23dfcc198440ba511502813..49a742598f5e60a0c52687394e10aba1cdc66828 100644 (file)
--- 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 b0643366853c805dc6b88dc130f3e72e0220400a..ecffe2e19a37387538c0b98aa8df4fc4f7b5889a 100644 (file)
--- 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 eb3965b89c49a3bfaf387eeaa7d8acd6a5ca69a1..095cd2a383d150e2060058088ac9a32445cecc24 100644 (file)
--- 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 def467770f236197b766a91555ba7215df32264c..81eeb5d8f2095cf082a16f62f72a3f89eb07f0a8 100644 (file)
--- 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 e6cd269caeda422925846f25dd4d8c1d25c09bce..98ed01acb4c725ccd5367d4e1bcd9cb0fdc81e2f 100644 (file)
--- 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 629ae1d2309380128789a8feb04bebb54f2b5d82..3328910511c683cb8c0b1595cc5f8985ee467932 100644 (file)
--- 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 <libecap/adapter/service.h>
 #include <libecap/common/names.h>
 #include <libecap/common/registry.h>

diff --git a/src/adaptation/ecap/MessageRep.cc b/src/adaptation/ecap/MessageRep.cc
index b5fea11d4e0d39dac73e52113aa0d13775b2833d..12fb703efacf0fecb7484b3f066255c7d330cfb7 100644 (file)
--- 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 d49952675be79721b3ddb2cd1d50c4d0ef2bf076..a63bd70a7acc115ab866aad13349e84f03a2228f 100644 (file)
--- 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 2a8fa88bdebf5affb9fd2a0a9accde96a685e05c..2f20f83e80062b47b36b3be96e4b4a8b9509b3a5 100644 (file)
--- 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 <list>
 #include <libecap/adapter/service.h>
 #include <libecap/common/options.h>

diff --git a/src/adaptation/ecap/XactionRep.cc b/src/adaptation/ecap/XactionRep.cc
index 656bda8b0041736bedb7e21755004aefddc20cc7..3c6c875260738822a0c2d8b73d135b2b0801d1ca 100644 (file)
--- 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 <libecap/common/area.h>
 #include <libecap/common/delay.h>
 #include <libecap/common/named_values.h>

diff --git a/src/adaptation/icap/Client.cc b/src/adaptation/icap/Client.cc
index 3825d51a102b29bc1141418084fab94ba5e73480..c8b8fd1fd14528524f93eba939bd781ece8bb820 100644 (file)
--- 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 79274354633f9ddb5e6001306e0c4361a2da789a..47da4f1e6bf8cd35199c7c3786d3f085161726b3 100644 (file)
--- a/src/adaptation/icap/Config.cc
+++ b/src/adaptation/icap/Config.cc
@@ -32,7 +32,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 ac82c70ad419137f5150c7bf2a9ac88a505656af..26de7d8db81a61de6e75066af945c8dd2794f9df 100644 (file)
--- 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 dbc2666492cdf8581431c3db9f088cb78afc33d6..4e1d5affae2ac8b3e05566a894b5f3f86da330fd 100644 (file)
--- 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 bf5482ddcfb058cccb1514621f18797830162010..bfb92f58778f365e969f9ec4ddc7a5ced21fd08e 100644 (file)
--- 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 0451714b0f46036d18c03f5c4d86a660fe926874..89f16d440194502b95d5308d9944f82bfcdff36f 100644 (file)
--- 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 174feeb0c4698a8bd1823f5da0e106b838fb701f..9ae9d3e70c77c602e78cf5fb546b2b5b06af8a5b 100644 (file)
--- 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 6a626e84ff7abe432b45a5be9d400ec2726b78ef..f216658027e75db2dcba8b697bf7f6aa1308cb75 100644 (file)
--- 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 aeb8621a5d5df4386e593e02c6cb7186bedb64ba..22d93d183a089775254ac3d2fa2b6828146e8a71 100644 (file)
--- 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 d4028c18e516a43412534d4444200fa1973b8df0..25823921dcdb7d659b0328b116e7de14e7ce9d3c 100644 (file)
--- 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 6148426ae619c7f6c2a68b8e64637ed6fffa1d3d..1fa5d57ab5d54217150a4e80a5e8a619fbef6541 100644 (file)
--- 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 8aee8e7cc547e5fa3b6acc0d59a023d0e580d2f3..db21709491ca43d255604ea705b993c8f5bfa158 100644 (file)
--- 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 3ff0cf9ff3f2e3001180f0959a1c389eb6aaed95..6537b225b4251ac1b704a38ed9bea71d70e1c0f7 100644 (file)
--- 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 d59a454da7ac221d95b73d1210761578ece6c83c..1aa9155357268213dee3cfdebac46da9b2122918 100644 (file)
--- a/src/auth/AclMaxUserIp.cc
+++ b/src/auth/AclMaxUserIp.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 d844f1a4896ec6534ace0a2fef3d779121005838..085e6c4e9c01d3a14bdf4bbce13f2ec1df07a48f 100644 (file)
--- a/src/auth/AclProxyAuth.cc
+++ b/src/auth/AclProxyAuth.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 bf6fec998c723fefe1447b2594509f21a0bba0f8..7fdeba71722edebabc2c5baa6ed53ed53d133da1 100644 (file)
--- 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 1a310612e2e70e537b46fc222e1951f5ba872f7f..e5b0acc8a45a93d14271e7bfff29d5ea4a0c1842 100644 (file)
--- 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 414551eab4e70c0f4d2bed97484c37ba9e16a6d2..e63f6d3060214c37826a8e4bfc58a26a2c8458c7 100644 (file)
--- a/src/auth/Scheme.cc
+++ b/src/auth/Scheme.cc
@@ -33,7 +33,7 @@
  * Copyright (c) 2004, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 78cb4bff996e3efba6f60b177ea9c1d82e0cffbf..187a83c543b1562b1ebb0ab216167ec7e6582ebc 100644 (file)
--- 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 efb764c506cb8d30687c6b7c491252e0f1a6b610..a86a866f1ffb219d238499d787cb739bab9e7a94 100644 (file)
--- a/src/auth/User.cc
+++ b/src/auth/User.cc
@@ -33,7 +33,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 f6f44f4e9b3c44c5fd31e13a08866212b225fad7..7ba7ebaf5d0b94892648b9401cc5813cce6a0b35 100644 (file)
--- 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 0dd718ac4deba0a2e2396f59bfe1efbae80bd62e..2628b024924ffb69398b9bab4857f9f997718f15 100644 (file)
--- 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 1f08b04edeff83a245e9f3af68ae62b941baef62..bcd1841839a55ecc367396d4fa1565d6f90711d3 100644 (file)
--- 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 99a65caa8051ea8254067b4c7de64db778965f5d..0efa5adb5cc1067044be78862930a394ce057f34 100644 (file)
--- 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 e6dc3e0740f12c05d8d83eadcc78b2d29b8676db..00531121ec28dd479af6f88f49b4401053d85055 100644 (file)
--- 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 31e89299284909f0620c01c974b986e3bef94e21..3060589a86114d97bc7501e3d8c299b32bc843a4 100644 (file)
--- 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 d7415b5118a78261a5155ad6659e1576650059b9..c89d797b08e9e771f456d6732c3bf7a5c8556853 100644 (file)
--- 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 ed842d5f195a4874ab3c5856dac3cca698775153..ef76ff49b01973612699d374d133cbd2102e05b4 100644 (file)
--- 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 442a116b0fab604e69179d1376ce6eb1275c3005..1db50bfa19e17eb039c0e760ccba3646b48cac4d 100644 (file)
--- 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 5b4f905647439d8b132c225ae6f7d6140b6c9886..ea988110072edc645a9299f01fa5a788a99ec241 100644 (file)
--- 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 729fa645c5be22999ca983380bb2dad095f8a43c..ca73352da29141fa631d62d197f22dbf6b1526b2 100644 (file)
--- 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 ed9815b9c0406f0bf4d66eed483293a0cf943b54..f0712d66febe7d4e4f371315dccadddfe56fe124 100644 (file)
--- 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 b14df085fbdad1f22d40b4454760d5db4d6703f1..453ee986568e87530a8e7c3a601838928075bc9a 100644 (file)
--- 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 b39c8f3cb075ab52bdfc120e44252755c4872284..e1236ea76145a59c7885fd6400e9509a1f08bacf 100644 (file)
--- 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 ebc7eff6751a7320fc3a1636e145df45395665bd..61457b098356451606410046e80114c287ad7777 100644 (file)
--- 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 21494aa30b0008d410a649b8c09ad920c0e2561d..b228d29dac72a75d6e6857b417f1eeeaa951a0f0 100644 (file)
--- 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 656fa8cacdfb01bd8f0b9d144456f53766df3028..4d2d3ad60a4fea95308aafde6a6f8b7bb65022f2 100644 (file)
--- 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 d6f981d069149f5d13dc1c9f0083d119cbbf04c5..88256d27f9fa2c3eedf77ebd7d2e13eb892ff4ff 100644 (file)
--- 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 c58e03a10db97698c8cbd81c27888c0ad908a84a..3c63810300e0c0bc4b97d9c75d9ed9f7bbdf0f99 100644 (file)
--- 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 8c135fee5dab0bc0cb0530d959dc20099db3a97d..451c40c9ce0a5384669440962525d86142b9132f 100644 (file)
--- 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 34c5bc57edd0eeb66e12c3ba0b164aa1f8138542..cbb3629cf77f4e4a40808008d98a8cc20bf467bd 100644 (file)
--- 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 700dd5653c97455257d2f76ac9ae025a3a33e3c1..0a93a763d1e9b98860f6d7c2689239c6afa9d4b4 100644 (file)
--- 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 <list>
 #include <map>

diff --git a/src/base/TextException.cc b/src/base/TextException.cc
index 6ec66b7794dfeb383cc3459e471b5281d574d713..30aab6c4bba02fcd5e311cf45ca18aa69d53912b 100644 (file)
--- 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 b0a363f8fcda47ea797ce698f023d5a97363a939..509ff91420359c35f8f29b88c78f90412f1c17a1 100644 (file)
--- 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 3c50a27db23fe011d19c287c56480162fbfd173d..063aeb8b22b79c301344a3e439ca8c0ac88d1251 100644 (file)
--- 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 88f195786c7ca45a5425d54806de387802223b0d..b45cf50c2e2371ffc075ba737d1eb85594c6a5b6 100644 (file)
--- 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 1b552f98422d21a891edc74371e0c877e0ab68c2..7918a48e874081c3adbc69711b5d01b1d1513ba3 100644 (file)
--- 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 cc92cd0c075e310108e9be4a5fada079398e7c32..54ee8e616159cc89cb09af0b08c2e3a1c14ca669 100644 (file)
--- 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 f42ba42f8f9f9cba01facfd95127bf10d3087a7a..d23c51e7c897940e0df80e50859e40d80d2b4c75 100644 (file)
--- 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 1744dabc177262e9e37ce8fab5c202dc9814b511..1ecbc523b7b49ad1e640f6b871f375d204bce98a 100644 (file)
--- 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 cbf1387eb776860696610487c29ad400caaeae1c..0df881542eb2765a5324574fb0b4bc4ef5e530d6 100644 (file)
--- 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 7543265d0a143e75fb3547137f7527baedacac2d..2b9d35adbf2dbc68427c73cdb34e7691c199b486 100644 (file)
--- 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 9ee0a8167e1920381715bf7316fc8cbcc2e31dd4..aeb726d018d9d5178db5ac0ded8dc37f10af8aee 100644 (file)
--- 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 4663c156f3255c1c453ac48fcabfaef6a9adc179..e08c91aefa0a7b6a7afe993f6b578906b0d64dc0 100644 (file)
--- 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 c50c1e5c45ae7ffab1fde07146d14daf806b1614..5e84030a9f4692c5cff9dda273fe86bda87b273e 100644 (file)
--- 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 908b10a141d9cc4f0d2b7f6d14af63695d74cdc2..aca3385789224cfa250f3e1a86b206d91dd8b1d5 100644 (file)
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -32,7 +32,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 34c4461b9bdf0bc136bde73dec03ccc502eee361..2cd9b6d229cd617998177bd7d25e25c75a4aa9cf 100644 (file)
--- 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 23f7b8ff917781e76c881c3242b57b479d9bb04c..5d3eb66e76e2ce5a1353628cd351014a5142f5f0 100644 (file)
--- 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 84f30c3b2a844816b4ec07c1a088d942b30f5121..2429c8c7ab1df99396f40f84253dcc1981c04b80 100644 (file)
--- 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 1c50995fd5ccc114f60ac34bca97d4737c0cdb5c..20744d9eb17004d5b47bb830a43d8f0318d071f3 100644 (file)
--- 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 c8806e28dad19e69bbe9e256727634cbec264c4e..4793e6a7520806a2d85d7a17f7e06bde0d1df788 100644 (file)
--- 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 f750a82f549cdc9313478af950e68a41899386a5..525587f719bfe9088bc2243bda3a0319a79e27f7 100644 (file)
--- 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 3e53cce0a00c5e2d887bec336562ab65d506e676..9a8f986905a2d78c69d20e899fc72275e6d87440 100644 (file)
--- 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 de3616cf173925762f7800672dd84c994587520a..4dab6e623f5dc2d37297ad818b8715bafece2046 100644 (file)
--- 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 53f79b358e5aa4d76a1a33cb0f2b7443b8736d78..2ee0ab388ff27ae7f90cb274cc5f2a153a2a5737 100644 (file)
--- 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 f8aa8833bb0425aa469a500cd00ecf6028ba0a23..c882569be760a10e571aed119bb3322b5eb1daf9 100644 (file)
--- 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 e378dd31a4ccabd8092e8abb5d6f5b329841d745..5eb36a2af403691c2a2874efc001f7f2937f75f4 100644 (file)
--- 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 f3feb7b170cd5a5e50a1145ceaf5c4e61dc5b0cf..f8ceeedb6992a7839eba89da2e4b254d1f9e656e 100644 (file)
--- a/src/comm/TcpAcceptor.cc
+++ b/src/comm/TcpAcceptor.cc
@@ -32,7 +32,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 88783d75a253e535fe2351190e2488357deb4707..641e7bda8fa41e75addefc31ea841c18e4cf2501 100644 (file)
--- 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 05ef8f6bff595b45ae5ede2877d8be65a9baa7c4..a2eb7d2c4f3794d9102da41f1a790dbdae193a5f 100644 (file)
--- 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 890e3fdb39453877d25c9073ab8a4b7a8d895364..3d5664aa0cff0493459d6269a52fd307e236aa69 100644 (file)
--- 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 04e1a5395124707aef47ab8e0d019f79a1d7d62a..92724c54a6dfa0ada86d0616811302b738fc9b6c 100644 (file)
--- 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 88120f1d70a17fb908fc90e986d674e9a20402e9..4ec5c29966f25b3c88bc0a1d9d24743fd72f1201 100644 (file)
--- 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 cf874d412ee9e705b46a0accd8a8fa7027cf87e7..a147aa20e40950019c9b367a58350ab6aab853cb 100644 (file)
--- 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 3625dc8cc4fbeed2ff7e2504ad76770ce9b2a076..9d88a7f348551114da90a4d0b4971b7e75a32d67 100644 (file)
--- 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 e9a9f2bbac724528955731fd0f4614187cd09b66..6ad1771176328fe4c2c4ff34b7d9a2b0ced56811 100644 (file)
--- a/src/dnsserver.cc
+++ b/src/dnsserver.cc
@@ -30,7 +30,7 @@
  *
  */
 
-#include "config.h"
+#include "squid.h"
 
 #if HAVE_UNISTD_H
 #include <unistd.h>

diff --git a/src/errorpage.cc b/src/errorpage.cc
index 39e10c6c0284c09a350f04f0a7a4814ce51384f8..53803ea6d373698984e29513f25617797eee05a7 100644 (file)
--- 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 494eff8e2169944d9782803365f91469f8c34b27..5b2bcf205142c5230938fcc63707883c864c2441 100644 (file)
--- 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 6b5aed741e402e56303934817ab1dd3d2924b5ef..04de070bcb7f522c29ad1389695217e30cafd760 100644 (file)
--- 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 744ef37ca8dabadb617c81c5efdc6d1676ac7740..563b06a4f2eb49d9d21b062b0c9024870a6d271e 100644 (file)
--- 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 e7b0f5d5e995ff5608d2377107635cc40930f473..ee4f85f6ff22afce725f5b269b637066b1a54f99 100644 (file)
--- 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 2db6adbcf551fc17c1e8e685ab16dc12b4c0e707..db7a77e8df5d89447e38223107a24745d647d130 100644 (file)
--- 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 d9bfba8f43ef8f6fd12d29197fbc9af34894e6d4..04f869facd35aa0d6ca08baf6c524f02add43cdb 100644 (file)
--- 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 15ff033b0a52a47c27a0512364ee3922b1f2de15..96977f54e3bbc1d09e3f4413d7cc9ce4c0f02f59 100644 (file)
--- 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 f547703d9b08aa7c0d70b6347a0ec2b518bc6b6b..5fa1b68b7e161733eb5e9795c80897c6e759e859 100644 (file)
--- a/src/esi/Esi.cc
+++ b/src/esi/Esi.cc
@@ -31,7 +31,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 7c684b0cd47d18c9dedc051c389fdae4c9847075..71b331b2c21040e08dc58c3ddb621075808bfe6b 100644 (file)
--- 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 3019af08ec8d1e55622f4fe6cf042493becc01f0..786c832153a43dbf5f5e93fc414cd99fa2e36c55 100644 (file)
--- 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 b81b5e2d624f9cf5c5f34794470c41d08b81377b..a230ea626767f43def450a268bba88db20999d1c 100644 (file)
--- 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 1ebd159ed3899fff94b9c4c0629db316c8986329..60b83e22a2a16c8e373b88f457fe5e07b1932934 100644 (file)
--- 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 54880c534912fed6a54c3fe64e8b873f6fa928d0..a850b2c9d49526fea1274f863f89152cdf1625bd 100644 (file)
--- a/src/esi/Include.cc
+++ b/src/esi/Include.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 a364d5ebd1a5bb37f80f204874b8199a2d3455f5..79bb5d413894e48c094f0437e08c03a29f64cff5 100644 (file)
--- 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 8f1a7faa6a861049afcb85d49d0a3453e64e5b52..359849a90495147e9935aa733100c7cec64b2127 100644 (file)
--- 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 ab946aa32b196f639a79d996fa6307888c0a0250..b74c608b210e28276456a1d315bc832c4d024c04 100644 (file)
--- 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 71b9be035eaa2bf8b6b2c313f6d6bb83bbb6dcc7..16d1bc9aa2afca16472a8f657b8eec664ea67b44 100644 (file)
--- 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 e40b8213659ff70144d05549cf7a36840bd16882..75e9c6e40a7b064e918140c99bfde344a92bba63 100644 (file)
--- 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 8ed6ddc6a492f9db0013ce191f2d51b171ff5948..32ca9fcceda64afb15375c2e5b6c3159cce3b334 100644 (file)
--- 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 bb4035c7d06c4aa82175ebe3f3f229fa94ed443b..d1fbce1d3cd22377af7cc6070477cc1bba043e6e 100644 (file)
--- a/src/esi/Sequence.cc
+++ b/src/esi/Sequence.cc
@@ -33,7 +33,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 0fd848cef083fbf56b9c7b4197aa13ba5f0cc62e..1f20c6b78eca4c049d5d23812a3dee4b13a18ef3 100644 (file)
--- 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 412414ced7e6a27c250315c512be8de9d92949f2..9ea8c245a47186ca3ef5773b3824e21dc5391eed 100644 (file)
--- 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 ba414c6b1ddedbf908c4bfbd0ced5b646bf2a4c6..8b899745e962ea0e76f7bf58b72582e0e1bdb029 100644 (file)
--- a/src/esi/VarState.cc
+++ b/src/esi/VarState.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 3135fc6a6661f7c6b61cafb2c5c5927e7b36665f..8aac9ad72380655e9bc7d85908e84eb5de0248fc 100644 (file)
--- 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 b65518f0f7eadb6e913f352a378e5c9ed628ed22..b05f8c3fe3777d983fa4fd90f61096fa7188fbd7 100644 (file)
--- a/src/eui/Eui48.cc
+++ b/src/eui/Eui48.cc
@@ -32,7 +32,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#include "config.h"
+#include "squid.h"
 
 #if USE_SQUID_EUI
 

diff --git a/src/eui/Eui64.cc b/src/eui/Eui64.cc
index bfbc33b8757be5655e40b2aa9656361ffba3f798..18b9995da4363a69e562185567f67382a8608a33 100644 (file)
--- a/src/eui/Eui64.cc
+++ b/src/eui/Eui64.cc
@@ -5,7 +5,7 @@
  * Copyright (c) 2009, Amos Jeffries <squid3@treenet.co.nz>
  */
 
-#include "config.h"
+#include "squid.h"
 
 #if USE_SQUID_EUI
 

diff --git a/src/event.cc b/src/event.cc
index 2cce5b57a9592c4c68277499e9b534dae1850a13..33185b5f869ebbe97a3b02f58ae251661a8d8b27 100644 (file)
--- 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 91e9665d5a3b58d087ac3f179b37b1bb4c5494f5..a8d8c459be7b66f170453125af354cfe2ef21d42 100644 (file)
--- 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 3d3d9bb2a44a5921299336608b0618fabb3f70b4..a358895fb9bca01944f531f96074442de8859e12 100644 (file)
--- 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 36a26b8adfa9d8a40e63075e2af5098c86c00f2f..215dafb5c88f30db47d2328e8f31ffabb765e1b2 100644 (file)
--- 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 49bd5300b8ab3b6c1aa94ad70d3245dff17a8f04..61854c6658cd973414cd4c19bd48c6673e3141e7 100644 (file)
--- 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 23d11e38eb1789fd352585803e1af1091ece35fb..bf4b5d50f009f879dfb6ce73887b0dd68d98e99d 100644 (file)
--- 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 7ac1272d2fb7d7f0612017b65b5a69a3abb546f7..991bcc45d40fa7138657512b6b6468d9b86a1f68 100644 (file)
--- 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 <list>

diff --git a/src/format/Format.cc b/src/format/Format.cc
index d5a281beb6b87f278d9e22027888e1ad16fdd144..18348e8148a9e7dec893004b8097a479fc8fff00 100644 (file)
--- 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 badff8814be669975ef96a1dce58d08bc195893d..102b168f4aa90af264a464a16cb186c92bdb5ecd 100644 (file)
--- 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 5a61d8330e53084af94b3ff1e24adedf731f82b1..6859e0a31c021440ec17c88ae8da73d22bb981ea 100644 (file)
--- 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 5e69efb06f2ef8c66be794e8c785593abab955c4..168e2c53e73c549f0ea071391fdd6d1f7fafc87a 100644 (file)
--- 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 831718ecffaffb90bb31d50734c6c38f9efdc987..ad1a5f60b74fe54beb38e8202d3b9b3dc41a9d81 100644 (file)
--- 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 da5951204b293237119c82f5eb2cd1f0f08fff61..5c900b5dbf4deff7b99f0637ecf5dfe7e01202d5 100644 (file)
--- 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 c0b75465f5ecb2aff20433d1a06cadde80248456..39d43f6a8f14b5aba9a6d0ac445c5b649fa8a121 100644 (file)
--- 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 fc89f0030994b01ec195f7807b10e5f6a21a1dc1..b9933b85834dc27944a52bf448769b6417dca21e 100644 (file)
--- a/src/fs/coss/StoreFScoss.cc
+++ b/src/fs/coss/StoreFScoss.cc
@@ -33,7 +33,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 f46e398ad7026c41229912f2383828a0a5e1a460..2d6b97f8e28cf1ae4703a6ae61a3d194d1a29771 100644 (file)
--- 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 8019d13ccacacde7378cb78509bef6c0f216ac33..c19642469fdf690df9192c802cb3b5ebec730f9b 100644 (file)
--- 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 4126c127602573e6a3ba693d4d62b8fd054e9288..1c375f55dad8053d8121b728fc4f180597c1cf81 100644 (file)
--- 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 c4689252f1a3b3d30c58e98788093831ebf70b96..45d07b1b7ece5402ebc623ffb0332690ead24f14 100644 (file)
--- 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 e73c6a6878cc46033994992619a8103aaa0b1825..d755efe90c2e0e2a3969c07d256257a7755d0a5a 100644 (file)
--- 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 18688fc48bf64f7a3fbd0afcb7d0a6d6bfd66544..94eea98707134372f6280a4b1d3eccbe8b2a14ab 100644 (file)
--- 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 9f7ef6b77feb4a36e579ef2d127e62e1d8c6f32d..05960a0876add45600247974f765ba2c18acd76c 100644 (file)
--- 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 ab56abdf6b4285d44ab1b3a336a6ad3c8a47d505..4d8e7b60e0be1fe3ee75f27d3c7118576727459f 100644 (file)
--- 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 79c8bf3c693a9099c7b9715d125a3bf2f5c45bcb..18fe2f6025c015c280ffc8692b6b226832c3d5c4 100644 (file)
--- 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 258fda06856a1f3f3389b34b728275778cb6ccab..bebcda5c786213bb1131d92fa65fd86779a6a456 100644 (file)
--- 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 e493283deb452775d6887d9a94ba1f7e80be4093..a9d21c9aa4557bf3bfaaeb01243d79e2a3974b18 100644 (file)
--- 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 0adb4b18e6b931e235a892b4a5149a184b787bb5..3f0a96ddd6bc9de3873e433730f7af4b684e4a6c 100644 (file)
--- a/src/fs/ufs/ufscommon.cc
+++ b/src/fs/ufs/ufscommon.cc
@@ -33,7 +33,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 7b7e6edd80c64bd536a6f450951747a6db939ace..a34a726fad3e84f3bf516e033533232c9b053da6 100644 (file)
--- 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 894d72f0af2c39650dfd7edbf9d32540bbb63179..e560f04e68aee345e37dfd70bb8e9eb0e368a2b7 100644 (file)
--- 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 43e802faa73dbbf99fc5736a6ad8c9c199b3ecd7..d3bfef0c7d18d5089ee01da9e7efaddc924998ab 100644 (file)
--- 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 a0ddcded4ae9315a124ee2690a5b3b189b08f9f3..7d70316a078b092dbc7b197626c17e296056325e 100644 (file)
--- 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 1b8272b353f63e82c30c443ec8c04ddc3ee0f218..b243ee55e50bb4e8168bac31eb2a0b1eb1a4f97e 100644 (file)
--- 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 60d0738ce26d601a0567a130f42982eef77fad02..b8dc2011988dfbf74abbfa0136c75fadac904235 100644 (file)
--- 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 329c64ddb273516a304d7dc6c18f981c582861ca..c6eb62ffea91e7ba2aa277870acc4893b064aede 100644 (file)
--- 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 5c24f6d23e77dac6a65b0bbcda446ea7c049f3cb..e1203ab6ee11331a3aa2df081278fe197f8ca5ad 100644 (file)
--- 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 d8dcaa4b20b1da7a13b77b6c1d2e8b477364b3fc..b2d8c1690a62c11a6caf202fcdfdc06da6b3957a 100644 (file)
--- 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 cea2b37f6a5db3c88c72b03f217f77946e361ab0..6d1c66c7219de77f8da698c6b9f4340aae1dbee8 100644 (file)
--- 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 9d46004bd6c2b3f25ff6bc34a94ce28136c76295..46f9e5e80033b1733f930cd827b7ddbbe5736483 100644 (file)
--- 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 3cfb03e4cda54b3b6f851507329117068c6a6d6a..d8beeec6adad28d1621df70b604d4d21eb676a8c 100644 (file)
--- 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 8bcd798dec02a7cee7a9443b70eeeb2fec46eb4d..1bbefdd12265101fedd0c6704fdc863be5871973 100644 (file)
--- 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 2532f4e72aaee3e9e3f443aff232a13178231e6c..f628abde3681d5eda9689599b73a15887269c0de 100644 (file)
--- 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 <cppunit/TestAssert.h>
 

diff --git a/src/icp_v2.cc b/src/icp_v2.cc
index 0b2ec86f2cba27cc00018dc554a433e1a5c4533f..436f36df848827280976acc8f6bce2363dafbd0e 100644 (file)
--- 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 510dbcb005ecb15cf395ed38922becbd302bf5ea..2caa62e41bd12c5777068b6d8f08e9ebb70d1c62 100644 (file)
--- 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 47a6885ecefac0264c9ba8d3bc2c58d22d9a18fd..ff164a3528d08a742bc71649ad83f82aea355e64 100644 (file)
--- a/src/ident/AclIdent.cc
+++ b/src/ident/AclIdent.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#include "squid.h"
+#include "squid-old.h"
 
 #if USE_IDENT
 

diff --git a/src/ident/Ident.cc b/src/ident/Ident.cc
index ec3ee17bd17e4136fc3c23cc64ddea20dbd0c65b..46d97b851f45df28cbc687dd5555b7370e563c53 100644 (file)
--- 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 1da700ab593d6b309b6588f3414fd7603148f499..6076c01baaef1c0287b0a444aa4088d4b58b5e8e 100644 (file)
--- 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 86ee69c676867516661c68022efc3e50836dd6d9..090a3e71dd25025793325d8005592210f15102ef 100644 (file)
--- 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 e5f9bea485d8213b4255d7a69e283d16eaef1093..b577c750745b4d69c0cc1657e3c4229a2ca50230 100644 (file)
--- 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 7d470ba56b3df3b842247555cc331a9ca536b461..446b3eacc8c6e8f0f29cca13590d93ffbeb99cb7 100644 (file)
--- 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 cae27f180000cff300f2d6bb9aea6ce3ae6845fd..1bda01f6a17f2e3501d14617e41568dae3277228 100644 (file)
--- 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 2bb4dbdf685cdb5394adab765bc44682b1483a1c..559c4358be28371ecebd28c4c4d88520dc9be7b5 100644 (file)
--- 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 180a0c2df4d6e987ba48a907a921d7415ea9a5f5..c69ab8f7cbd05423ba7c87f0f88498e0a472cc38 100644 (file)
--- 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 e930331e09d3f5e62c31d8787b630647fe4db39e..57d788ae372760c1b840dbb35de9094f9823aa05 100644 (file)
--- 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 4883131f15f164a6fbb3a42bd7dd18be9dac294a..eba613db6498ffe2ab718e1cd27d69367f507a12 100644 (file)
--- 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 910b1a7c5f6ae4cdaca29d8b795fa4eb0b3eaf24..2fdcc98ee5d4abdc090547cad8c3545848da2976 100644 (file)
--- 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 cffbba9b8dd99ee11a814007cb1819be78a36e32..6f1a10a31ff374071b4ce08cc7aad9cdd5bd81ed 100644 (file)
--- 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 f7ea3cf73f67e7052b3314f32c94a680436bf520..e3c25d66858769edbfdc4012f236aa72616e5e06 100644 (file)
--- 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 b5ed2019f5e825d0244016ce6e034f38fca72770..0f652a6f1ace9fcd02b462527623fccc8ae89353 100644 (file)
--- 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 22c03a2d6af106ffe780c4421fc0fbdbd2f4634f..5ff66a38032047393fec181e34b4236cebf4bc9b 100644 (file)
--- 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 1663e12ddc59031577ef51fb38307915b8387c3a..5f436037a0fa0ee978e945fcbec5c4eadc486c41 100644 (file)
--- 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 2423fca3c9071ab9ce3f93031dc7cb6af9bc2bdb..0747b564e1cb661efb4497d53aaa2fd288aca4f3 100644 (file)
--- 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 710fde7bf40b7a6e65347d8f69e642ddb0374269..29c3bc213bfcd10a1bb8fa75f91237ffddb10171 100644 (file)
--- 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 6627aecb5d9ecd01fccae301995577ed1478fae7..c2dceb873526dafebd27c0055d5b4f72b4245bf0 100644 (file)
--- 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 f319264f88af4303724ec03ab3bedbf75b7b858f..7fc164fb1a9ce0b4b3a7475930a07425a0c23a47 100644 (file)
--- 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 e102aa1a41bb8b75c344d4e2b8d3e320d40533e0..8453f05a318606f57d424a1629e95c6684396c88 100644 (file)
--- a/src/ipc/SharedListen.cc
+++ b/src/ipc/SharedListen.cc
@@ -5,7 +5,7 @@
  *
  */
 
-#include "config.h"
+#include "squid.h"
 #include <map>
 #include "comm.h"
 #include "base/TextException.h"

diff --git a/src/ipc/StartListening.cc b/src/ipc/StartListening.cc
index 299ffb54b938f6d6c5b479e927abfbeecd0e13e4..c13cc0ac223c0ce60860b47d3bcf31209a1969c2 100644 (file)
--- 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 f91b522bd29d05123f344e76e34ea5a699f3a16b..df5cc8c3d376738ffde2e390db2ade0e3ab00386 100644 (file)
--- 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 3b8a39c12a449ba7072594ce531856a310e22ccd..53a690c1b4f9109e2d8155139bb916a944367e51 100644 (file)
--- 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 c10c4839db2073064934e7a7dbd13a6f1944e32c..50c41de75d7a54e98e9db65d078a4fbad5f51e5c 100644 (file)
--- 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 5b281d92e76bb99bbe6854f7c6d8594a27fa7f7c..b23fe37107e97f90c5288f1625c2510d8d90ecb3 100644 (file)
--- 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 2ccb0be8dda729ce2e7f941775491d78ef2ec43d..bb653742cd48326746b1adf03d3cb02b3b5c9ec8 100644 (file)
--- a/src/ipc/TypedMsgHdr.cc
+++ b/src/ipc/TypedMsgHdr.cc
@@ -6,7 +6,7 @@
  */
 
 
-#include "config.h"
+#include "squid.h"
 #include <string.h>
 #include "protos.h"
 #include "base/TextException.h"

diff --git a/src/ipc/UdsOp.cc b/src/ipc/UdsOp.cc
index 7230e37b34d9775cc1128634d5b27faf36749a28..12b03d0d4f3b5888ea5a7bb391d5b1fcafa04756 100644 (file)
--- 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 e1fb96c88ca7c537d0f9bcfb3a18538a8c21d03f..283dfcf8a8306d7c7542b9eafa117b4f74230051 100644 (file)
--- 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 187cc712061fc380d496c27fa846e30e33ebe1a9..532003cf9768fa20545052e76eb5fa7d0fb95d95 100644 (file)
--- 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 353ab90794526633b853b77141faf58651a58769..239d598dec634bb6595d2f3fc998e0d39724d3ae 100644 (file)
--- 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 c97487d2fe153a61ff53d7276488580845f34ed3..27051f15e00bfc8215b0173fc00b1b0b038e94f8 100644 (file)
--- 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 b9cfa6b2f31d06680a867f185bb7c7d66b74c79f..e5f5b5f8ce42bd4e61cc7eb9b384a1f2e1564bae 100644 (file)
--- 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 9a72f01474f1e2d104bd0cfe6bf97c0406d5c3dc..5b808d430a3459c9c38a41db63f246bf802e4c0c 100644 (file)
--- 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 30129c1cf7be3365e29c84e2a0cc10d2f6dcb6df..19b0f31a4e2de7992444243caaabdbcba331767f 100644 (file)
--- 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 ea5fb177a06d60bdab155a93d493f1f58c72c9b0..2d9d26eb49a46953cee489f19f28a7d792a86815 100644 (file)
--- 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 02ba17f2d6f99a23f1e43b824640cecdccfab49a..37dc7e5a5fe97b2c0d8b4129668ca32990d287bf 100644 (file)
--- 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 b45aeacd6254f1b4803878e3d982d404abfa8114..dfd05cdaf3d416abfb5e11ad38f04a82d1040bab 100644 (file)
--- 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 50fb3d646ab8ca3b3a565467a80c60e9f0bbb1f6..573c82bcb9bb70bf29dc6afe748228800370c369 100644 (file)
--- 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 d5c16fc90323c5fe509726403f16714973eee597..82a0a030156349ea1970c2c2d90c2f700a977674 100644 (file)
--- 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 1a94b5170bcad03a6e8b23cdb7cbd5e1ed7ba351..6cf2427d33a50fd72dff51b435911588f6bd6da7 100644 (file)
--- 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 e40f987e67b2dcfce75163cb2408abcfea47e235..72a98c7b511356c8ab53307c23e16613d4205708 100644 (file)
--- 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 21ed037148577482db99461af2772cd282c9c6aa..b3eb1c1af35585c2b9de11f297a94e4b80aae45f 100644 (file)
--- 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 6932b9cdbb0cadae44e6c322c8c0109d16795cf4..16f8b3d17b0197194ebfea4f039f5a991d0d7727 100644 (file)
--- 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 dc1ae23a5bf778ad92f38b3f6b88b24e29b770ec..9eb825006f05d8a31c186e8a153c455eab9499ec 100644 (file)
--- 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 59bf69b761b93d65633ce552ece020cc3cabe4c3..3e7979200f3e2bbb4fc403f0b211eed0093e6371 100644 (file)
--- 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 05d09a1a9d6464043aadc029e83fdccaf230e62c..efd7a4b061f4837c3e6226c4584b535410580b04 100644 (file)
--- 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 c79d9dc7a57b58a59f0fe381e91c4aba42ea5cde..fa7e6dc0b5db6bd9b594875c7c5dbbd4f4dc2159 100644 (file)
--- 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 03c8c751d03bcdb47f779a3aaa3cfbed971edd38..49a820b257d1a0c766fd3d5a50ac5e7ac4bdcdac 100644 (file)
--- 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 1e22538348a995b0093a339678dffdbda5695abe..800bc307a9e83fcccb4354a286fe74327894495b 100644 (file)
--- 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 f36e865282ba4c3283aea3aae33e8d4afcf3ddf1..88265626fad243bc8cabe24c0d1d160d7754d70a 100644 (file)
--- 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 cb58e09710d332909e81fe06556ddeb367a86bb5..b4a3c5df6e853cd65ff21360c2a5b66cb4dfa89b 100644 (file)
--- 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 0f176efc659aaec28bc1cb1395815e1ef3226266..4cdc9ddb61239f29432a07b6610576dfd20e81e2 100644 (file)
--- 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 6c4578d5a5ef7a8e637088532dc61abc835f9d66..afac91e7529fc809afc0d0bd28dbe0c2647c2825 100644 (file)
--- 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 83f4cd0adb6e8dabcc423cc8fa3920e0e032ec6f..c5d13e4571536e0eb6e7deae7951b3e25cb1fc57 100644 (file)
--- 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 e4c5746820050be7d259a0a5b6dca16a6cee8e7e..1f47c275b3fb279d883f030570d5c9c6f3a1262d 100644 (file)
--- 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 739471cadc9eb50d01c756f38673eb0a2a1e7db8..3ad3d0f506c64b06f1f2926932ae7d0fb6fa9384 100644 (file)
--- 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 1d0a8909a8b33424b8e32d6f93179ffc6d62eff9..7ed43318f685a71251ec1559a37101a13ac9e93c 100644 (file)
--- 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 2d57b2dba006d87ebe0ac512a131d9cafb1d9497..4be01e2b021df1ccd7881dd2cd68c4579dd8a3c1 100644 (file)
--- 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 e65eee760bde299047bb9bc321d2b37a400b3695..f9fa61e0ba0d7b16c49070bc309c978ee0d7d01e 100644 (file)
--- 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 83adae6175296f57ec6a7ed3d33bc11f93d51d56..a43caf57524295450d68af85af388b5742019208 100644 (file)
--- 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 8c384725deb255cdf879421b260cac97d5ca94a6..9d6f2170a20bb6b14c44455cfac683e7c8652edd 100644 (file)
--- 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 7df8a8a6b282513d9d1dad113790d68fe70dd107..c2823acb103fcbdda116c899b3070ab764c4dcf7 100644 (file)
--- 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 3e7c3412aca44fa344ba0581184f1504440c3a6a..bd1028e18fb5dbdd17681d07dc48afdff621a971 100644 (file)
--- 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 c55b1dbae4543358be0906386a1d97819f2fcd9f..294c0045c53b6407ee6d8dde23aa102b635b1ee6 100644 (file)
--- 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 70418aa791578d7511853dfa175d83b96f2a804c..c2f77b128851d8e310c0a56458295ad215c965b0 100644 (file)
--- 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 1186b38ff5fe84146f8998463babcba9ec24896b..e6d67b843b1ae6da10e378cd293fa35097c4444d 100644 (file)
--- 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 4e60968827ee7f23482e35b41c4bc352c87e0b8b..a6fc39ddb720903ce68a5d14a63b9b5cc63eebc1 100644 (file)
--- 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 fc1e165f2b2e3e3778cf86648e697032767188a8..4d71b10338135f4e8ea929794f6395cf89177631 100644 (file)
--- 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 7e7491072cf6608a03c2edcf239093d79e2cffaa..7c5a68d6cffc3ff093add4ac6023dff6c1b471a7 100644 (file)
--- 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 bf99adf36192de925bb5471810a40f711dcb6005..79f8235e0d58238294443f606d253507bf65d29b 100644 (file)
--- 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 38d48865b1783425b2023958ea047010618e41b1..ab79b475db6a26ba93589cd3f38a23fbb582b7a1 100644 (file)
--- 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 b02681b9b46cf3ba4a05e70503223884f4edd93c..fe4f54cbf4f1df9cb92b1d6ca064a0cb0657da08 100644 (file)
--- 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 8eb056fea7db42c022642677f1cc1a43945e7255..2365974aa1969658d9a36478f70e8a85c10dbf00 100644 (file)
--- 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 ce579052fcbef66dcaaf303ab45adb5737df3afe..5764ec7e53a0eb8e59d252ae9d0603be01422c14 100644 (file)
--- 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 358b0ea022c7dc93a943783a017bc66ee5b1746b..8d0f7a2ecacd5d3ead39009c137aaa147342b7b6 100644 (file)
--- 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 d5b0af09aa72fb9e715b069c72590a979afd0a1c..b03e96ee62ddc57966c5e667dcf2b77ea5494c55 100644 (file)
--- 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 7c7af825c48a8faf883f6dea13e27b2309ed7e72..704a5fb00cd3cede7556dea8b42cfcf5379be273 100644 (file)
--- 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 02decf9c1a15552953c397a66d5748aba77b7dfc..e0a3fbd818d1ef2fb664dafdc40ed7f81fcb6eeb 100644 (file)
--- 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 be0ebadf3a3458ef1cf2ae168eaa7f7cf6cdbcc0..f1997334246022673216401a4366ccfce355e13b 100644 (file)
--- 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 0d999fe728e18b2954029432218606b0457c90e5..59712bfd1f5eca42bb544863443b935b60f5aaf5 100644 (file)
--- 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 2a1c24ea2791e1e226778233440b17d538849816..023fcda89a32486540d3ae4c02a763b57b29ac55 100644 (file)
--- 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 4f75424b6eea50cd5c63ffca0bdf203463ba7772..29b84b9c806081983e095cc1c6b405be4409c8c3 100644 (file)
--- 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 3ddf4df286d27e41a214ab57316873a97f206a9c..973a1af4b687b2a46b15b0999504746a473c4d16 100644 (file)
--- 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 1d5ada7acd304b0bce5e3fab8dbbd27b3c370e06..e05db06ac5640d4258ab44d282be9d5d1ccee012 100644 (file)
--- 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 c822b9db6563784d122c860b108c7f8aa107978c..71a76a472a8965687f867f1c7718f3a3b1d8d761 100644 (file)
--- 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 f353975bd29009661a84de30743720ad703df21f..cb4b8752a1612808bf38ab04dd6fdf39d7c9a6cf 100644 (file)
--- 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 53584c53d95d204f27451f1b0e5b1c92cb0e9185..0012a9561050d2d26b0431fdd67b7f2e87d60547 100644 (file)
--- 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 f75e3fc0eecceb8283d3d29c87e344b0e87a2657..2a269dd69eecd211d2034392650f201e5c2e1e34 100644 (file)
--- 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 <stdio.h>
 #include <fcntl.h>

diff --git a/src/redirect.cc b/src/redirect.cc
index 7cb6bdeccba4920b49c50cbf25e147199b78b396..a6d450e346ad36ccdd4039b0d93b9e59f51353fa 100644 (file)
--- 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 9049aa1335b28c3e087da222db7e0a3d29780e0a..da8d3eb9a5c80c796285004e8988f85100bc3d03 100644 (file)
--- 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 8ecd07fadbd4e96bbb0c4c8140addd1f5cfdb334..68ee1b938cc7142ff13f5aa3aae11c41e71f1eaf 100644 (file)
--- 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 5cf1809c6310d3a6a50a9d74b7a05deb30f71f4b..0121e0fcd32977c7268682a79051d4f48f4bce6b 100644 (file)
--- 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 893a5a6059fa0a80880a98f6163baa750efa60d4..f276b65296270859e748c8f8346955efda01fa16 100644 (file)
--- 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 03ea3e5624b9e3220e66bc51f06bdff4c400643d..79d80b9f90f6ef96ff81610b3ce419fc588b1c8b 100644 (file)
--- 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 87b0aea5b0bd0f0685f1aaef24f8530639c74001..8f63020b5009532c5160dd107ac7dca83cad8008 100644 (file)
--- 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 4f19e60c1b636b83a1a115c1b4aec61ae4849cc4..2d2a992bc01e54a5bc2ce627c7d2e719d839074a 100644 (file)
--- 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 eb3d12ff9004e8808dd6a62f9a6cfa49769bfdaa..73fbe4bf47d18af80555d14bb2316930a6a85afd 100644 (file)
--- 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 b204f8c2e90f1a09ca45a62287b78becfed214e7..4081b77fe838fedf8c6f902895981b4081e034a1 100644 (file)
--- 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 0128f16a87fcf6dd53073b3c432181b6abe53be9..2ec5374ae4788e2880367b5b1be5c75a764d578f 100644 (file)
--- 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 566ec96d62687bda8470b5ba4013dd74be8ab995..155e0eb58f30cc7b237d464e58cd3db3ed799699 100644 (file)
--- 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 a3ad52ce65b85b12e10110860659c5d66e07700b..f05e6220ac763a5173442256d127a30bc6996c13 100644 (file)
--- 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 0905d7b4b3b15bc4cfd5969d3a2894ebdc60a540..e220c7871fdd0c614f77a4be1959dc3fb618414d 100644 (file)
--- 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 729c0d1bcab3eeef6274a8098982dd1f187073cd..87b6dc0308bb77a63b30e0a5832636f6c93f1a34 100644 (file)
--- 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 c1f456043269c04baef64578f204610503b2cd66..a5ccf4953ebbf976bea656ca0910b92197ca6c43 100644 (file)
--- 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 301c6ebf85bb508ff4980862d3bf8e26b27ee372..6fee7bee2ac245998c7e38eda529cb0a68725bb5 100644 (file)
--- 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 8c2c2f8430236779fdef542d60c2ea96e1696336..4029abffd1d1c6a9c37de8812e5e9b02dd360ec6 100644 (file)
--- 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 4bfe6e5e623af564d9a6078079757d0404b95a47..76ddc1a7d6ca0ef6329a437a933af4bf63f166f5 100644 (file)
--- 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 c2237f1874abbb560a57abf855ce39edb271a8f9..0f15494d02d7346b41c1d241ed75089077f3872e 100644 (file)
--- 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 <errno.h>

diff --git a/src/ssl/context_storage.cc b/src/ssl/context_storage.cc
index bc02b47cf5d18b0c2095061f73612b3dc9e676a5..d5ec656af784266b659ab07dc01b03a2546d9fe6 100644 (file)
--- 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 1ade0a7ceafa96d6bef3cf1410cb14ffc50a55f5..de4f70df15d28b84cba0a0cb654610293837ca53 100644 (file)
--- 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 <cstdlib>

diff --git a/src/ssl/gadgets.cc b/src/ssl/gadgets.cc
index c1263e78b01cef24bef8f2788fb012c29dddfa65..5b7709a32b60130981c7621b45347815bc372c16 100644 (file)
--- 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 <openssl/x509v3.h>

diff --git a/src/ssl/helper.cc b/src/ssl/helper.cc
index b6e16e9fea61046fddd3436ed211d4d8069ce177..8f4f2f0ced898302f281ea70f956016c0aceb6da 100644 (file)
--- 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 354d62ef99d9ddf7011a38b7213edf6e1b8a2bc3..b39d34c74bec8aeb1ff8719f0c890d4f41b27424 100644 (file)
--- 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 8c15b889051dbb256b78c7b0b39915d60b080761..cf87011912cd68502b255bbe2295f249ee4bc2fa 100644 (file)
--- 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 5ecf4af91c9f8bdf326b79bd1bebdd70e5e4951c..384c0005502f7b84c4bd37eb20d1841282edafd9 100644 (file)
--- 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 03dd48b883a646efe2146d2b82aff41b2a5ca3b1..9e047a945d279dbc937d1f12da08ed5aba05f440 100644 (file)
--- 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 e8d489f76fcae6a4c74c7260c967a7d39102fadc..22750b465d7fc71810d30b6195277dc5bd73f0b5 100644 (file)
--- 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 719ea1d7ddccdecf12efd32fe47bc793eeb3bbf8..716c3097fac62a67b9e6da8f48b7fab20f04db8f 100644 (file)
--- a/src/stmem.cc
+++ b/src/stmem.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#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 7198db54f038f9db95ae5a47cfef84a783311383..1c9a9e18a0dbcddca7b818f9ed7b9ecdca464067 100644 (file)
--- 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 fd8003b3e5ada344147e6f8722a4803a8335ba84..8e022d8093de0078765a7a22b3f0acae8adefb57 100644 (file)
--- a/src/store_client.cc
+++ b/src/store_client.cc
@@ -34,7 +34,7 @@
  * Portions copyright (c) 2003 Robert Collins <robertc@squid-cache.org>
  */
 
-#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 14649ab5f1c858fc2bc83cc459f1bfa99733ab85..1172f8a54a534907c3a794d725885c0edaa23114 100644 (file)
--- 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 33feeb8e283e6aa4400ad8a6727485e11da03c4e..5303ce3864a149e322098c380c7c9c79c1a99a6e 100644 (file)
--- 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 aca973ed82dcc4945fc61df54df20a7ecd3d68b4..8d87a2993f4f95a4e11fb7000e2a930648dd66b6 100644 (file)
--- 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 06f1377a4ab10e75692b4e116eecf200b52d5e43..300b766646907d9cad63618d5374e6b4e340f04b 100644 (file)
--- 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 ddbce3be7ebf3acf205e4d00bede54695d3dba7c..928512f9b41443d29cf279a501afaf13939bb9f3 100644 (file)
--- 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 fe88871132fade8ad9847843a272b17ebae3d68b..521cf26b689bb62d7ac9bc9d6f47acf97edd005a 100644 (file)
--- 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 6d9d105a1e0ee6f2d8ea9b4794937702eb9c589b..d7b81875a23c48beeb0dfb47d6966355ee075ceb 100644 (file)
--- 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 3a0086e00e40c613d584e72dee9b26a1518328dc..79e1e0aa1cd22940704082a23b935ab475480c1c 100644 (file)
--- 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 36063095d33a805a4baebb3335078c6a75625b2e..7e896c5ca023dbc6958788e8c784fa5f72fdbe15 100644 (file)
--- 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 30ae1dbf0989a6b7c1ba841f6cd7cd249a3060ed..3498eedcef841ff10fbc9d2c7a307e50938f1c6e 100644 (file)
--- 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 b650b646ce2eeda3915e521a97f4b26d4c9e3e08..19cc0e8786b681a49f82ea69265e0bcd8ad61476 100644 (file)
--- 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 ad6f81d63ed9f3320d0be8cdaa6713341965172b..5785249c2eef18d00ae60fd38065050930b50916 100644 (file)
--- 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 ca46e9a5f83971d9b590fad048cd7e4950a60395..95347359e5f1062d0f2cb1482fd14b455ce0786e 100644 (file)
--- 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 c2d926efb1f891792ea9266b08570abb63a5af19..2828531bdf2817007292d693f7be7b87b8913c83 100644 (file)
--- 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 74c8a60a4259e746e8da9c254bf5fd39a26ca97c..457726bc7bba69ea428ed222c96cb95870d34ae2 100644 (file)
--- 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 23538ce384dc9a0b39d3db84e9c3999a69b0030f..0fede5afad09afc52108bf5c4ec47ad787e3c3ca 100644 (file)
--- 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 30e7bc67dd12388f393dfbb4ee2ae29b76911789..c6a12b21bc5d90aa525badb0abd59ef55c7fa8c0 100644 (file)
--- 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 a18602706f3ca234ca9659a0f52faa79c8914656..4b053d1ff5381e124da31c0834f9a8fd38f5e3b8 100644 (file)
--- 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 5a99d8c2d0d8cb703998dcc7f8f8acdb27efaa93..7d2600bf70293165a7d0a70c3b30015736f9017c 100644 (file)
--- 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 de357af1946396aefe55a74d754b3d5a3d0d21e6..206dbe4bf36e5be7a18c7966afa783aa0c65bdca 100644 (file)
--- 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 1d7f2f9b3fa3beab3075d2ec3277dea131526a00..5c12a54ead8d1b408955c835cb8ee4e5e4171773 100644 (file)
--- 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 dd48a0bcfbe589cbdb40392e312a8b66e0600e42..cf0cfdfd4ea21c35ed458ce904ee9a616e0a69a3 100644 (file)
--- 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 f78dc820cb4912cd03452d090c88a4bdc562db5c..4845787a4e2c0bc3e0f22691a5804aea0b0ba2a8 100644 (file)
--- 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 2c8afff80f4f4c76a9024347ca127906386fe5eb..836a87a0d817ff75482fc452ad9b866e54800c36 100644 (file)
--- 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 7b82af51e5f896874cfd73a6c3259bea26043420..81421d2a0b0f7c1d3fe40d8fe71e23d164deff4d 100644 (file)
--- 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 31a91ca52cbf49ddd94077b184d17cfbddc93062..69b092fa9da3ebd10b2e16b1902f41963005fef1 100644 (file)
--- 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 cf69d1869f3d3228125739ab2b2f1a5078c9120b..819182a4c2d532dbb817f98f974e7fea2c53b2b7 100644 (file)
--- 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 9425c9e2ddbb69825e50415acf69f48656ed1816..072454bee44ea4d00d6955f57c295032e3310740 100644 (file)
--- 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 7bf75c2b5a1228162fe97dc5ad99c2bd1866faf0..e91b22fdf2e96d6127778912403783bc734ce0a0 100644 (file)
--- 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 5c4747f75e552c6a3b5ead92eeaec43718c4a973..272949ce395be844b10b9fac086c9a9514594c22 100644 (file)
--- 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 556d3b4e0043422376341b89bfe65f2434df9bfd..5988bb7e1b9d1e1def2144e086e986176a065217 100644 (file)
--- 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 831bdf3b16692482d82884571e33f1a5d38a5dec..99bb0bcfefc4aff300d731cc7700a4a865182ebd 100644 (file)
--- 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 defa64dcd663dd36a303843ab0662fc2dd7b47e6..1bdb14a48f22da04a0de63cffdec81a63dd60abb 100644 (file)
--- 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 85e60a648c84f540900bc6b4de44207171a292d1..afd90cb2305e0e5c28cbdc28a465e80aa24c442c 100644 (file)
--- 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 f2a8de5a1d3197ca7b79922ef198fb555ed5d4f1..d178a0396b622bc3c4e6b521eea6e647ddd9e13a 100644 (file)
--- 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 af699054ba16e0b45c7e940dabcf41e06e69d63f..e6d2302a57be9977b3ffb9aa8c6b2292b31e2c9a 100644 (file)
--- 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 0de7f81a96a0b73602191272b8e96ca6bb621891..04de5ff46b49034da29bceabe7f3605a2ac177ff 100644 (file)
--- 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 45a9f3124d79b4cf9da6fdd4d5450d49590278be..f7419561858f8a78112d5eef759ef2cde46d34f1 100644 (file)
--- 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 1180582e93e3d33cae43d05992bf826d045a986b..8c5c2f0eed7e3cd8fef37e7212b93bf0fb7b16e2 100644 (file)
--- 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 03234df0de149c55886484bbb55fa914ff6903f8..56770a2a004f98e40511f9ab0cd1f89d74bdf310 100644 (file)
--- 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 0e00b7a8c0a1ef4b289a3920f97d77d5a814ce0a..a3366048c69785bb3f36686dd9f3f0c17e2b816f 100644 (file)
--- 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 9ae91b2fb50f836463ba019c385774052cc34ab2..2c05d3a1e5a2f610ee44bd856b1600e7b062724b 100644 (file)
--- 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 653947b4301ce27bdb47cdc44f2bd871863cfe8f..9759ed4a1c5095aaaad37c19c0aa335fe2467747 100644 (file)
--- 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 a5adbce6dcc9b31e5ef25f0f31f28baf77b8adb0..d5d539a17457a4d6f4e6b75d51c602352c84d323 100644 (file)
--- 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 8a069a8d6a730795095f5d49e8516b6d5c1768e4..39d3a6f6762b5e94d2c27cb3b349f6c05ba50bb9 100644 (file)
--- 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 97c159930589c2f35d1e3556547d65b87d9dac7e..53cc877b1fb69e55f92700860770b8e9593b72e3 100644 (file)
--- 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 59ba00643f2c8469357d3df1bb271bf2744edf84..b19720124fa524af152166abf671bc80acb12178 100644 (file)
--- 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 d2be1f0af56348080a3c667ebbdd18435e21434e..a7a8613084a08460be61cabe620a1877f41306b2 100644 (file)
--- 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 7446e10ad94182e44659b1305df7edf3bfb1a298..3a7fcd3d7287044f8fb3757f39753957377ee9c6 100644 (file)
--- 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 8e62c37d4b3d8ba071d142e42b230149508d3134..b40e3f51bf700c1c463e7438981e0666749e5540 100644 (file)
--- 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 cee7152423ba5708f02476032e51b1ed943a1faf..27046c3a75bc2cdcc5664c2880b7a4bbde6a0120 100644 (file)
--- 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 b8732c73e76461d9cca24cb473b5f27f54d87675..98f674dff8c45527141c87ef7e6d6da7b5bf6934 100644 (file)
--- 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 c90f04277ca261969f0d9b509c32b5bca6affa7c..16e87d28c062074b1164e7e5d094d954b736ac9b 100644 (file)
--- 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 608cbddeb2509636bbf43593dd5441a63d4085cc..56cee08e00bdd4b0bd2d11c862dfbdbea4ed7082 100644 (file)
--- 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 9a43f8441d756194cd916e09df18ee77c06794fc..ce975ba572acba5505571e350833b68c50b8eecd 100644 (file)
--- 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 78806fd61511f4053a9c814b915da20f85224442..6a77145ce556a556401dfea046d34778fec40913 100644 (file)
--- 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 6ff3b048755de509edf94b74047545994a562df4..422c95b2bd9aab75adcd02130edc355c891fa1ca 100644 (file)
--- 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 3ec920a685a43e821c7b76bd23811c00fc9d2e51..3586c4136a64583ce01309ae46f2adace9c6ea99 100644 (file)
--- 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 b7be6ec6c20b7fc995e6ca2ee1a8c71de44363f4..24b96939603b13f98fade36c23de267dfa84f7df 100644 (file)
--- 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 091d56d96c0ac313f5699062c5787315e4c60c1e..239cadf44934a5012185ebca6e5747a704f4f3fa 100644 (file)
--- 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 8d7d2d39cd20d8517dba99be0ce9dcef7ab27bd7..c45effb0acf7edd74df68d7492dd55c2d5641612 100644 (file)
--- 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 702a88fb693b2334352f31d9fd8e5a26281624ca..355057fb367809aab111443c7be43a2acb0d4c34 100644 (file)
--- 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 <cppunit/TestAssert.h>
 #include "mgr/Action.h"
 

diff --git a/src/tests/testConfigParser.cc b/src/tests/testConfigParser.cc
index ecf59647932f39dc22bc7703d3ae2ef1973c777b..b17fd7a4d8927402ac1b3453c7af054c368ec115 100644 (file)
--- 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 12964410661a0f997e2131a5e52a391aa3f8d9d3..3fd5f9945efca849bdea02e9d5e51a222be2bfd5 100644 (file)
--- 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 4c5b4cdceab73248377e4de6dcc7f0d0126b0166..343b296dc889a5620b85213f20ae983e4515ac05 100644 (file)
--- 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 57fb0a3df4bfa7168003bea27f027c00173fca6c..7741e61f39f2496bd9bc0f4495bd137cfd5c774e 100644 (file)
--- 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 <cppunit/TestAssert.h>
 

diff --git a/src/tests/testEventLoop.cc b/src/tests/testEventLoop.cc
index 03412038d26aedde2b469c1c985c57f73534756c..d5f3bb2e9630e02559cedd8ebd0733c9636d2272 100644 (file)
--- 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 <cppunit/TestAssert.h>
 

diff --git a/src/tests/testHttpParser.cc b/src/tests/testHttpParser.cc
index 5081dc6382e42ad90a07d4a6d963fa1066ed4af2..7625cc55ee67b93dc6cf2e802173e152ee37e883 100644 (file)
--- 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 <cppunit/TestAssert.h>
 

diff --git a/src/tests/testHttpReply.cc b/src/tests/testHttpReply.cc
index 60938c0b70ea9e495c7153bd3f04b67997180d2b..f7c0a2152cfa5f3bb591c30b78e7b3b1a20bee3a 100644 (file)
--- 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 <cppunit/TestAssert.h>
 
 #include "testHttpReply.h"

diff --git a/src/tests/testHttpRequest.cc b/src/tests/testHttpRequest.cc
index 01d0a3c6de084a06c2ba6a669eee0146ed632efb..04a01c4942d8106cccd35975e49c2a7aa11266a6 100644 (file)
--- 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 <cppunit/TestAssert.h>
 

diff --git a/src/tests/testHttpRequestMethod.cc b/src/tests/testHttpRequestMethod.cc
index 57c4e819c8b43e6d15d1b7796d26d571a611d57a..c9c1d285e7d9bc77c7e05a2a0ecc0610a99f5192 100644 (file)
--- 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 <cppunit/TestAssert.h>
 
 #include "Mem.h"

diff --git a/src/tests/testMain.cc b/src/tests/testMain.cc
index 01042cbf2332794c2e78d5a262be9e14e5f916da..30a6a82bbc73b080d1b2ec33dfc6f4a87538b821 100644 (file)
--- 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 <cppunit/BriefTestProgressListener.h>
 #include <cppunit/TextTestProgressListener.h>

diff --git a/src/tests/testNull.cc b/src/tests/testNull.cc
index 62e93948cea8daad5f3bbac0ae4c14cc6ffe8e1f..a987615b13368d93ccf3315972cccb741624b32b 100644 (file)
--- 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 1b604c4e0755c925c43055d0f4b466c17d82a73d..c64f9167ecf37e9b6cb690ae27241c1460c01927 100644 (file)
--- 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 80ca4c23c81ce3e7c61c40b0df592009aa833cb1..8e037686610a0d802ddd7aa4c3354a425999d7fb 100644 (file)
--- 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 0c4989d25a814a669fb015108e6a2955c27aac80..3d4b4407537ffd5da2990036d77249fea7d0bf00 100644 (file)
--- 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 cd09fd0f3b878bf159eabcdece32304d781bf26f..90ae69d54d35340f4dd16e18e8ec40c0c7f8139b 100644 (file)
--- 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 <cppunit/extensions/HelperMacros.h>

diff --git a/src/tests/testStoreController.cc b/src/tests/testStoreController.cc
index 8d7c976e309e6619dd57a5b5b3ab0509f94c3cc7..70a892ca59503fdfe0ccc4616a6423a7808d2420 100644 (file)
--- 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 4b0abdc4b23495b8e426ed3484c5bc3217fcaed8..a1a75e0dc571af74c098fb8ea3252eef54cc0a41 100644 (file)
--- 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 56c97639b5e15f1d9225fb3a260cdf611f9e280e..ede33dcb4508691122e88af66199697479b5b778 100644 (file)
--- 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 3cc320f23441668b1db66d4440ba18cce3d82ce1..89664c54936b771dd28cd65e32c1b900246df12d 100644 (file)
--- 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 6667d7ac76485716a6526ff31d71d63af399f138..32d3e9a6c61f906315baa4de1018fb8c23976858 100644 (file)
--- 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 a9adf6aca19b6993ca28f35e16062711b906712d..89997eac765d03a1e813f7763495215a6306298d 100644 (file)
--- 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 <cppunit/TestAssert.h>
 

diff --git a/src/tests/testURLScheme.cc b/src/tests/testURLScheme.cc
index e6e1b8ac209a93b4a145b7ca1213f1181c3fffd4..5b8678b66a4baef4ae3de13071f559843bfdcaab 100644 (file)
--- 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 <cppunit/TestAssert.h>
 

diff --git a/src/tests/testUfs.cc b/src/tests/testUfs.cc
index 654b22c5c44bd9f9216372ea318f7d38cc05c107..34e129135a392d86b39a01c591341db56cfb4dc0 100644 (file)
--- 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 02212f2312722c44926dadaa2a4d47088a042cad..49f36ee59057df093e44d1b671b48e37c8e8c78f 100644 (file)
--- 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 bb0bbdd9c81d5aa7eeac390fb993456477660ddd..898bb0f0eefe35b227909233fd33e7fe1820e9e0 100644 (file)
--- 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 bc0d83162e1e4a4e20a51299e0ba84ff793342b0..3020753499d70d89944911275dcf962c4ff16e26 100644 (file)
--- 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 dbad0d7f094a5911dadb6dbc79e942fe93f8b699..739ae2a59bdd823bf74002c5d3f2743f9308b8f6 100644 (file)
--- 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 f7ba5b005179bbe09f2222f7584b36ebd306fc47..85db56398243fe91769880787c7a03727554ec43 100644 (file)
--- 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 a3545de45e577d9bfddd773141534898204b4ede..46c416e3a89361e7cf29d70877509ddee9e2bdb4 100644 (file)
--- 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 5779d3b41ca3f887af46c744d0b22f5e35a8624e..23c7074a1aef48ab2f2e2d8df737abbd85682345 100644 (file)
--- 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 292b036968e60f5aeece8268cf42bd56c63a67c6..e9dbf53e5e0ed9765baf874ecf57131327cf4407 100644 (file)
--- 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 <paths.h>

diff --git a/src/url.cc b/src/url.cc
index 5660c53d58eb0dd54256b53d20dab0d759e1155b..8c485f255507316b7d054107b5caad9df1b4d767 100644 (file)
--- 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 93126175e5ba96820a2a636143484e3233b54800..544e9498a45eb69ae12661ea9d6492b3e55cad95 100644 (file)
--- 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 cefcbe2286ea8796481e59b80fae095492cce8ed..2bcc5db0d416600a6f14e7443a4ae23ee07fd698 100644 (file)
--- 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 35aeb6c738e2d8fcfd8aea6b554c62fd4d74182f..521fee239de0b3c67933aee4e5d25fe37105c31f 100644 (file)
--- 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 9573c72ea4d3a6689091e64fbc6681702b801984..b2c74b43509344a15d9edddb73f13ad4c81f0088 100644 (file)
--- 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 81872324be0a5da6d4afadb49dbf7fac21dc97bd..3d5f0cb38f938b0645c7c89b37dea2c5602e408c 100644 (file)
--- 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 c580f612a9760c8ef6e322102696bd05174abced..d937da0fd9dfa890bd482bf33bafc0d7dddc21d1 100644 (file)
--- 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 e6aa34f0fe5f8f6f37d958af87d3eb7dc0ae9cc4..165ab5b37982f6dfad04bdac29225c68e0567e2a 100644 (file)
--- 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 bf3c82fddd32b240e3787608e23499b709aa06b1..5649bad761a8df82c144098edff7521cf23af7c2 100644 (file)
--- 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 1ce1e934f597ee8bcc6112eaac07cd9f647b676c..e2730eb2f4bac5ee120086578017a81711cd0462 100644 (file)
--- a/test-suite/MemPoolTest.cc
+++ b/test-suite/MemPoolTest.cc
@@ -32,7 +32,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#include "squid.h"
+#include "squid-old.h"
 
 #if USE_MEMPOOLS
 

diff --git a/test-suite/StackTest.cc b/test-suite/StackTest.cc
index c996f3ac57f8c5be819a8fe9130b13480663fa75..4606f95d56f2728963031391319f239f6a4fb459 100644 (file)
--- a/test-suite/StackTest.cc
+++ b/test-suite/StackTest.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003  Robert Collins <robertc@squid-cache.org>
  */
 
-#include "squid.h"
+#include "squid-old.h"
 #include "Stack.h"
 
 int

diff --git a/test-suite/VirtualDeleteOperator.cc b/test-suite/VirtualDeleteOperator.cc
index 51db1e6c0fb8d5c1a1d97df76ff7920416155bfb..68567d14c22dbde0213fb04dacdb9a476bdc5873 100644 (file)
--- a/test-suite/VirtualDeleteOperator.cc
+++ b/test-suite/VirtualDeleteOperator.cc
@@ -33,7 +33,7 @@
  * Copyright (c) 2003  Robert Collins <robertc@squid-cache.org>
  */
 
-#include "squid.h"
+#include "squid-old.h"
 
 #if HAVE_IOSTREAM
 #include <iostream>

diff --git a/test-suite/debug.cc b/test-suite/debug.cc
index 19c7011d02c7e704c9393f3da2938ea826cb93e9..50f64dd3c0caf39fa9abaebc5b839b275588139f 100644 (file)
--- a/test-suite/debug.cc
+++ b/test-suite/debug.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003  Robert Collins <robertc@squid-cache.org>
  */
 
-#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 aad95dc151fc5f425c88b4efa6f547b4a98406ff..e11d118e95f21d69ab23b080ac4c470f7f939d90 100644 (file)
--- 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 <unistd.h>

diff --git a/test-suite/mem_hdr_test.cc b/test-suite/mem_hdr_test.cc
index 76896265d7bf3aae9c3deb89108468ccf0669b07..fb4443fa8ac7fdfcaad32e47a885d6f98375b44f 100644 (file)
--- a/test-suite/mem_hdr_test.cc
+++ b/test-suite/mem_hdr_test.cc
@@ -34,7 +34,7 @@
  * Copyright (c) 2003  Robert Collins <robertc@squid-cache.org>
  */
 
-#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 f1d3a5b31b58aa0c7e774cea3debd5eef2477b42..d362be2fcb4932d5779cb81f7bd669e67294f081 100644 (file)
--- 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 77eddbddcd41b31e3cbf56d47fbccf722ab937bc..19e495301de14970c8bc8b65ce3d6d4fdc3de98f 100644 (file)
--- 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 6bb8ebf997ef2a98c727f92512ba1712966d8576..7dbf65c5cc29d27ce9da287c2075663a7c562097 100644 (file)
--- 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 93ee96fc00e31755158ef454e8d229ab6de808dc..fdb17a41197e77d4ee4185f8e43b729d8ec0b095 100644 (file)
--- 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 64beb7d17c7596641b511408257c566a5b8017d4..6f0a147fcd20d511d1b3b8760a5731cf54bcc38d 100644 (file)
--- 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 <stdio.h>

diff --git a/test-suite/syntheticoperators.cc b/test-suite/syntheticoperators.cc
index dbdebd4e6dd181620a7c925d203775a4161a0492..6c9dfdb9df5f6cf445cf2fd205ee45a721c21b49 100644 (file)
--- a/test-suite/syntheticoperators.cc
+++ b/test-suite/syntheticoperators.cc
@@ -33,7 +33,7 @@
  * Copyright (c) 2003  Robert Collins <robertc@squid-cache.org>
  */
 
-#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 aa297a14a039f0149593388732a4be678df0ce2c..63d0094f09fe2170c1a5b4b94e71354e054c380e 100644 (file)
--- 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 e3d4f3fbe6e6f723cce67ecbdbd8db1923bec5a6..33c69a5e2942e21dbebd321ec8bacee30d56086e 100644 (file)
--- 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 235ab3c796495aa4f00377ca6606fd7342d54996..86f415f46e41ceb68b4a3a38ea6e6ff3eb23994b 100644 (file)
--- 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 58b21d5b1ca24ffe71feb3ee3d48a570c59a83c7..1036dcd3196b49c8097ef045bfbb016a85eea383 100755 (executable)
--- 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 <<EOF
 /* This file is AUTOMATICALLY GENERATED. DO NOT ALTER IT */
-#include "config.h"
+#include "squid.h"
 #include "${f}"
 int main( int argc, char* argv[] ) { return 0; }
 EOF

diff --git a/test-suite/waiter.c b/test-suite/waiter.c
index 770fa099568b0500144262df6a96c6f789675969..71513cebdf11fd83b77b6977c73b918214ed101e 100644 (file)
--- a/test-suite/waiter.c
+++ b/test-suite/waiter.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "squid.h"
 
 #if HAVE_ASSERT_H
 #include <assert.h>

diff --git a/tools/cachemgr.cc b/tools/cachemgr.cc
index a8c3930ee6fd59c783290d521165c79f4a828626..0aabb5bbc463ca0f1a0ce1462151de9508488535 100644 (file)
--- 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 81f0c21ad0706d91342676b903880b421c1e19d9..177051ca23cd67ff09e6b3a37d48876c914d21e3 100644 (file)
--- 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 39013172f119b4805f6f453e84c17b29afd83bc3..6ffb2a68101b692b80892759535c6eef4ebb1298 100644 (file)
--- 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 40ad881f741708513fac347ead64b1bdd22e12c1..c7db508cdb356a2564c684fa446229cb08ba9888 100644 (file)
--- 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 <assert.h>

diff --git a/tools/purge/purge.cc b/tools/purge/purge.cc
index 4f3d47bee941adc46c6c37dbb1a49265df255a35..de27261d6af0cfb9384119fc65ae42076bbf9529 100644 (file)
--- 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 258106c421c7a0d38222514ac8810d3f9be64ef8..758978afe66f4ded6eab236d952a5bdb5e696720 100644 (file)
--- 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 <sys/types.h>

diff --git a/tools/purge/signal.hh b/tools/purge/signal.hh
index 8760624b4c1092f13f1a7fcc1273f9ee0e581d4e..1d0f46eab18405e0333bad33e4dbf04b9790f438 100644 (file)
--- 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 <signal.h>

diff --git a/tools/purge/socket.cc b/tools/purge/socket.cc
index ce1b4dd879a87964180b0aa508334972753c00c0..20bac0a7969ea0084477c0e1449c2972ec159186 100644 (file)
--- 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 9232e81cdc55e1ae848a52b4467d6659538da046..275f8c6325c0a7806a8730c969519912357fdd42 100644 (file)
--- 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 <assert.h>
 #include "squid-tlv.hh"
 

diff --git a/tools/squidclient.cc b/tools/squidclient.cc
index e6b5172d22466c69c8aa546af591fd167fb1b3ba..05b5cd93dc145d7c0712376619d104588e1ced9d 100644 (file)
--- 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"