From 8f645002f3f3e9f78236268da9e043588a160e74 Mon Sep 17 00:00:00 2001
From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Thu, 6 Sep 2012 15:29:14 +0200
Subject: [PATCH] Moved CustomLog to own header and implementation files.

---
 src/adaptation/icap/icap_log.cc |  1 +
 src/cache_cf.cc                 |  1 +
 src/log/CustomLog.h             | 15 ++++++++++++++-
 src/log/FormatSquidCustom.cc    |  1 +
 src/log/Formats.h               |  1 +
 src/log/access_log.cc           |  1 +
 src/structs.h                   | 14 --------------
 7 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/adaptation/icap/icap_log.cc b/src/adaptation/icap/icap_log.cc
index 0da66d9ee0..80470480d3 100644
--- 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 ca61ea3d43..a79dc20428 100644
--- 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 05519db577..635c071f66 100644
--- 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 cefffa39ea..1f6eb83703 100644
--- 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 9ca1c324da..6f54e0dc58 100644
--- 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 8b724b1539..84d7c06d87 100644
--- 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 af346fac8c..5744ce0724 100644
--- 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 */
-- 
2.47.2