Moved FQDNH declaration from typedefs.h to fqdncache.h

diff --git a/src/acl/DestinationDomain.h b/src/acl/DestinationDomain.h
index d8e967bf831492d5757effb8ab63e49211c658a9..49fbba8dfcf35cf742cebd10a952f01a94386017 100644 (file)
--- a/src/acl/DestinationDomain.h
+++ b/src/acl/DestinationDomain.h
@@ -13,6 +13,7 @@
 #include "acl/Checklist.h"
 #include "acl/Data.h"
 #include "acl/Strategised.h"
+#include "dns/forward.h"
 
 /// \ingroup ACLAPI
 class ACLDestinationDomainStrategy : public ACLStrategy<char const *>

diff --git a/src/acl/SourceDomain.h b/src/acl/SourceDomain.h
index 3c459ae8c2ceec1716dc3d259e6d6eb1a61c0730..455ad647633afc0d4f3abf13095f507d447c7184 100644 (file)
--- a/src/acl/SourceDomain.h
+++ b/src/acl/SourceDomain.h
@@ -12,6 +12,7 @@
 #include "acl/Checklist.h"
 #include "acl/Data.h"
 #include "acl/Strategised.h"
+#include "dns/forward.h"
 
 class ACLSourceDomainStrategy : public ACLStrategy<char const *>
 {

diff --git a/src/fqdncache.cc b/src/fqdncache.cc
index e9cb18e6f91d12fb340501a358c306fb60595715..94c76a037d23373bb24a17c1074a3d2aec7db37e 100644 (file)
--- a/src/fqdncache.cc
+++ b/src/fqdncache.cc
@@ -14,6 +14,7 @@
 #include "dns/LookupDetails.h"
 #include "dns/rfc1035.h"
 #include "event.h"
+#include "fqdncache.h"
 #include "helper.h"
 #include "mgr/Registration.h"
 #include "SquidConfig.h"

diff --git a/src/fqdncache.h b/src/fqdncache.h
index 0ac57c88a59419e787d5415bda1524053b090ee0..1067ff37ef76b3e917eb29302d46315134987b38 100644 (file)
--- a/src/fqdncache.h
+++ b/src/fqdncache.h
@@ -16,6 +16,12 @@
 
 class StoreEntry;
 class wordlist;
+namespace Dns
+{
+class LookupDetails;
+}
+
+typedef void FQDNH(const char *, const Dns::LookupDetails &details, void *);
 
 void fqdncache_init(void);
 void fqdnStats(StoreEntry *);

diff --git a/src/typedefs.h b/src/typedefs.h
index a157c6a6c9eb11c28a989c2aa0410e9fcc44caf5..ea25e3d83c767091619aa8de5ae8f38a42ade5fc 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -21,12 +21,6 @@ typedef void DRCB(int, const char *buf, int size, int errflag, void *data);
 /* Disk read CB */
 typedef void DWCB(int, int, size_t, void *);    /* disk write CB */
 
-namespace Dns
-{
-class LookupDetails;
-}
-typedef void FQDNH(const char *, const Dns::LookupDetails &details, void *);
-
 #include "anyp/ProtocolType.h"
 class CachePeer;
 typedef void IRCB(CachePeer *, peer_t, AnyP::ProtocolType, void *, void *data);