Moved CustomLog to own header and implementation files.

diff --git a/src/adaptation/icap/icap_log.cc b/src/adaptation/icap/icap_log.cc
index 0da66d9ee089f7e50e45a0cacfa0bb54f64fddea..80470480d3d29191b329f0f24ce5a6be464ba29c 100644 (file)
--- a/src/adaptation/icap/icap_log.cc
+++ b/src/adaptation/icap/icap_log.cc
@@ -1,6 +1,7 @@
 #include "squid.h"
 #include "icap_log.h"
 #include "AccessLogEntry.h"
+#include "log/CustomLog.h"
 #include "log/File.h"
 #include "log/Formats.h"
 #include "SquidConfig.h"

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index ca61ea3d43673273c9d7c9c918e4f446b555bb36..a79dc204283694c99e1ba50cfeef72f96cbd9f80 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -57,6 +57,7 @@
 #include "ip/tools.h"
 #include "ipc/Kids.h"
 #include "log/Config.h"
+#include "log/CustomLog.h"
 #include "Mem.h"
 #include "MemBuf.h"
 #include "mgr/Registration.h"

diff --git a/src/log/CustomLog.h b/src/log/CustomLog.h
index 05519db577adba10ab00c9e29ea45f8a9b7b8eb5..635c071f66bb918ad4ed713de35f9df234469939 100644 (file)
--- a/src/log/CustomLog.h
+++ b/src/log/CustomLog.h
@@ -28,8 +28,21 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
  *
  */
+#include "format/Format.h"
+#include "log/Formats.h"
 
-class CustomLog_ {
+class ACLList;
+class Logfile;
+
+class CustomLog {
+public:
+    char *filename;
+    ACLList *aclList;
+    Format::Format *logFormat;
+    Logfile *logfile;
+    CustomLog *next;
+    Log::Format::log_type type;
 };
 
+
 #endif /* SQUID_CUSTOMLOG_H_ */

diff --git a/src/log/FormatSquidCustom.cc b/src/log/FormatSquidCustom.cc
index cefffa39eaa4c278121a34bc446005b733ccd1c0..1f6eb83703c984ed4a82ef4eabb60500b57f0da3 100644 (file)
--- a/src/log/FormatSquidCustom.cc
+++ b/src/log/FormatSquidCustom.cc
@@ -32,6 +32,7 @@
 
 #include "squid.h"
 #include "AccessLogEntry.h"
+#include "log/CustomLog.h"
 #include "log/File.h"
 #include "log/Formats.h"
 #include "MemBuf.h"

diff --git a/src/log/Formats.h b/src/log/Formats.h
index 9ca1c324dac92a1aef12e13790ce0d5c87332464..6f54e0dc58acf9fd5c0de26e9e04d9e6a089e57a 100644 (file)
--- a/src/log/Formats.h
+++ b/src/log/Formats.h
@@ -5,6 +5,7 @@
 
 typedef RefCount<AccessLogEntry> AccessLogEntryPointer;
 class AccessLogEntry;
+class CustomLog;
 class Logfile;
 
 namespace Log

diff --git a/src/log/access_log.cc b/src/log/access_log.cc
index 8b724b1539a20568d74a67bb7008a3e5fbb15083..84d7c06d87a834e14ada1882dfe5fdb3fa19fa59 100644 (file)
--- a/src/log/access_log.cc
+++ b/src/log/access_log.cc
@@ -44,6 +44,7 @@
 #include "HttpRequest.h"
 #include "log/access_log.h"
 #include "log/Config.h"
+#include "log/CustomLog.h"
 #include "log/File.h"
 #include "log/Formats.h"
 #include "MemBuf.h"

diff --git a/src/structs.h b/src/structs.h
index af346fac8c76dbbadefffc784fc8f40ddacff64f..5744ce07248f4522237d76ebff97d9f78eac4de5 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -380,18 +380,4 @@ struct _sslproxy_cert_adapt {
 };
 #endif
 
-class Logfile;
-
-#include "format/Format.h"
-#include "log/Formats.h"
-class CustomLog {
-public:
-    char *filename;
-    ACLList *aclList;
-    Format::Format *logFormat;
-    Logfile *logfile;
-    CustomLog *next;
-    Log::Format::log_type type;
-};
-
 #endif /* SQUID_STRUCTS_H */