Add omitted Format Token includes

diff --git a/src/adaptation/icap/icap_log.cc b/src/adaptation/icap/icap_log.cc
index 3371c678eee42f79ade47844644aa6c73f670798..8aee8e7cc547e5fa3b6acc0d59a023d0e580d2f3 100644 (file)
--- a/src/adaptation/icap/icap_log.cc
+++ b/src/adaptation/icap/icap_log.cc
@@ -15,9 +15,6 @@ icapLogOpen()
         if (log->type == Log::Format::CLF_NONE)
             continue;
 
-        if (log->type == Log::Format::CLF_AUTO)
-            log->type = Log::Format::CLF_ICAP_SQUID;
-
         log->logfile = logfileOpen(log->filename, MAX_URL << 1, 1);
 
         IcapLogfileStatus = LOG_ENABLE;

diff --git a/src/client_db.cc b/src/client_db.cc
index d476980693475bbfd3af5bd7522d9a24133a664d..90e5d513556f1f14cd6cd0e8ca6c92c43e68ca0d 100644 (file)
--- a/src/client_db.cc
+++ b/src/client_db.cc
@@ -36,6 +36,7 @@
 #include "event.h"
 #include "ClientInfo.h"
 #include "ip/Address.h"
+#include "log/Tokens.h"
 #include "mgr/Registration.h"
 #include "SquidMath.h"
 #include "SquidTime.h"

diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc
index f9814f8f48e2351ac195cf12b3d5596e20110e68..c7b06a10f8a9e79b9f75966c2f004ac340000705 100644 (file)
--- a/src/client_side_reply.cc
+++ b/src/client_side_reply.cc
@@ -56,6 +56,7 @@
 #include "HttpReply.h"
 #include "HttpRequest.h"
 #include "ip/QosConfig.h"
+#include "log/Tokens.h"
 #include "MemObject.h"
 #include "SquidTime.h"
 #include "StoreClient.h"

diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index 0e4f56d6eb5cd6300aea279e68557ed2f6867429..f59086eca4bffaea829d08990514f9cff0c14b1e 100644 (file)
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -65,6 +65,7 @@
 #include "HttpReply.h"
 #include "HttpRequest.h"
 #include "ip/QosConfig.h"
+#include "log/Tokens.h"
 #include "MemObject.h"
 #include "ProtoPort.h"
 #include "Store.h"

diff --git a/src/globals.h b/src/globals.h
index a110e2d6159f93f8d851511a503f7cb5c231ab79..0ac3da8aeb94b7a84bdcd5e5b6839c7ee7b40e39 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -54,7 +54,6 @@ extern "C" {
 //MOVED:structs.h    extern SquidConfig2 Config2;
     extern char *ConfigFile;   /* NULL */
     extern char *IcpOpcodeStr[];
-    extern const char *log_tags[];
     extern char tmp_error_buf[ERROR_BUF_SZ];
     extern char ThisCache[RFC2181_MAXHOSTNAMELEN << 1];
     extern char ThisCache2[RFC2181_MAXHOSTNAMELEN << 1];

diff --git a/src/log/FormatHttpdCombined.cc b/src/log/FormatHttpdCombined.cc
index 899c92194e13d0fd8ae4d7b4e57c1f821fbdc586..1679be3dfada6c8a6419bb6aaeaa2cfe3680a6f1 100644 (file)
--- a/src/log/FormatHttpdCombined.cc
+++ b/src/log/FormatHttpdCombined.cc
@@ -38,6 +38,7 @@
 #include "log/File.h"
 #include "log/Formats.h"
 #include "log/Gadgets.h"
+#include "log/Tokens.h"
 #include "SquidTime.h"
 
 void

diff --git a/src/log/FormatHttpdCommon.cc b/src/log/FormatHttpdCommon.cc
index 3e721b5d1b75982333187b482fe5e39952565685..7bfa35a5e68670d8af028f0b534f398f43c44754 100644 (file)
--- a/src/log/FormatHttpdCommon.cc
+++ b/src/log/FormatHttpdCommon.cc
@@ -37,6 +37,7 @@
 #include "log/File.h"
 #include "log/Formats.h"
 #include "log/Gadgets.h"
+#include "log/Tokens.h"
 #include "SquidTime.h"
 
 void

diff --git a/src/log/FormatSquidNative.cc b/src/log/FormatSquidNative.cc
index 297b6ccdbceeb12d99f2f98f10779751a39460f9..d523c57f73cefa96223516fa78fedfb1b615d5e8 100644 (file)
--- a/src/log/FormatSquidNative.cc
+++ b/src/log/FormatSquidNative.cc
@@ -37,6 +37,7 @@
 #include "log/File.h"
 #include "log/Formats.h"
 #include "log/Gadgets.h"
+#include "log/Tokens.h"
 #include "SquidTime.h"
 
 void

diff --git a/src/stat.cc b/src/stat.cc
index 7c4a5adb2d1ae463cb687d2ce32e3279ea6a75d0..706a1ac06615ac4b4632c66be6fb1eb835457d53 100644 (file)
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -39,6 +39,7 @@
 #include "mgr/Registration.h"
 #include "Store.h"
 #include "HttpRequest.h"
+#include "log/Tokens.h"
 #include "MemObject.h"
 #include "fde.h"
 #include "mem_node.h"

diff --git a/src/store_log.cc b/src/store_log.cc
index d1113226453deb8995836ed561fcaefe04f3b9bd..56bbcec8c2343f78753db0f0fbc3c414d3c92ad3 100644 (file)
--- a/src/store_log.cc
+++ b/src/store_log.cc
@@ -35,6 +35,7 @@
 #include "squid.h"
 #include "HttpReply.h"
 #include "log/File.h"
+#include "log/Tokens.h"
 #include "MemObject.h"
 #include "mgr/Registration.h"
 #include "Store.h"