From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 12 Dec 2010 12:51:33 +0000 (-0700)
Subject: Add omitted Format Token includes
X-Git-Tag: take00~47
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8432e271bde4d973bfa5359e4182092411d223ee;p=thirdparty%2Fsquid.git

Add omitted Format Token includes
---

diff --git a/src/adaptation/icap/icap_log.cc b/src/adaptation/icap/icap_log.cc
index 3371c678ee..8aee8e7cc5 100644
--- 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 d476980693..90e5d51355 100644
--- 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 f9814f8f48..c7b06a10f8 100644
--- 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 0e4f56d6eb..f59086eca4 100644
--- 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 a110e2d615..0ac3da8aeb 100644
--- 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 899c92194e..1679be3dfa 100644
--- 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 3e721b5d1b..7bfa35a5e6 100644
--- 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 297b6ccdbc..d523c57f73 100644
--- 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 7c4a5adb2d..706a1ac066 100644
--- 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 d111322645..56bbcec8c2 100644
--- 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"