From: Francesco Chemolli Date: Fri, 28 Aug 2015 18:02:41 +0000 (+0200) Subject: Moved FQDNH declaration from typedefs.h to fqdncache.h X-Git-Tag: SQUID_4_0_1~81^2~10^2~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=23032e75269e16a8612c787d20c02183b34547f1;p=thirdparty%2Fsquid.git Moved FQDNH declaration from typedefs.h to fqdncache.h --- diff --git a/src/acl/DestinationDomain.h b/src/acl/DestinationDomain.h index d8e967bf83..49fbba8dfc 100644 --- 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 diff --git a/src/acl/SourceDomain.h b/src/acl/SourceDomain.h index 3c459ae8c2..455ad64763 100644 --- 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 { diff --git a/src/fqdncache.cc b/src/fqdncache.cc index e9cb18e6f9..94c76a037d 100644 --- 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 0ac57c88a5..1067ff37ef 100644 --- 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 a157c6a6c9..ea25e3d83c 100644 --- 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);