From: Francesco Chemolli Date: Sun, 23 Sep 2012 09:04:21 +0000 (+0200) Subject: Removed now-useless inclusions of structs.h in various places. X-Git-Tag: SQUID_3_3_0_1~33^2~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a745811524cc54c68ab0f73a3220d6ed79c40213;p=thirdparty%2Fsquid.git Removed now-useless inclusions of structs.h in various places. --- diff --git a/src/CacheDigest.cc b/src/CacheDigest.cc index 5ca1ccd31a..b51cb3e4ff 100644 --- a/src/CacheDigest.cc +++ b/src/CacheDigest.cc @@ -41,7 +41,6 @@ #if USE_CACHE_DIGESTS #include "CacheDigest.h" -#include "structs.h" /* local types */ diff --git a/src/CacheManager.h b/src/CacheManager.h index 3a1aeb4a38..bb5885557f 100644 --- a/src/CacheManager.h +++ b/src/CacheManager.h @@ -37,6 +37,8 @@ #include "mgr/ActionProfile.h" #include "mgr/Command.h" #include "mgr/forward.h" +#include "typedefs.h" + #include /** diff --git a/src/CachePeer.h b/src/CachePeer.h index 94067ec9e8..50cea94978 100644 --- a/src/CachePeer.h +++ b/src/CachePeer.h @@ -33,6 +33,9 @@ #include "icp_opcode.h" #include "ip/Address.h" +//TODO: remove, it is unconditionally defined and always used. +#define PEER_MULTICAST_SIBLINGS 1 + #if USE_SSL #include #endif diff --git a/src/CpuAffinity.cc b/src/CpuAffinity.cc index 9d5f2fbdc0..54f500fa90 100644 --- a/src/CpuAffinity.cc +++ b/src/CpuAffinity.cc @@ -10,7 +10,6 @@ #include "Debug.h" #include "globals.h" #include "SquidConfig.h" -#include "structs.h" #include "tools.h" #include diff --git a/src/HttpParser.cc b/src/HttpParser.cc index 0ef9ed3b0b..39ebeb3044 100644 --- a/src/HttpParser.cc +++ b/src/HttpParser.cc @@ -3,7 +3,6 @@ #include "HttpParser.h" #include "profiler/Profiler.h" #include "SquidConfig.h" -#include "structs.h" void HttpParser::clear() diff --git a/src/HttpReply.cc b/src/HttpReply.cc index 5782f2dc65..44bdc5a671 100644 --- a/src/HttpReply.cc +++ b/src/HttpReply.cc @@ -45,6 +45,7 @@ #include "SquidTime.h" #include "Store.h" #include "StrList.h" +#include "structs.h" /* local constants */ diff --git a/src/HttpRequestMethod.h b/src/HttpRequestMethod.h index 0a3bd3bf71..11090dc229 100644 --- a/src/HttpRequestMethod.h +++ b/src/HttpRequestMethod.h @@ -32,7 +32,6 @@ #define SQUID_HTTPREQUESTMETHOD_H #include "SquidString.h" -#include "structs.h" class SquidConfig; diff --git a/src/SquidConfig.h b/src/SquidConfig.h index eaa3b94aee..131eb25c21 100644 --- a/src/SquidConfig.h +++ b/src/SquidConfig.h @@ -37,7 +37,6 @@ #include "icmp/IcmpConfig.h" #include "ip/Address.h" #include "RefCount.h" -#include "structs.h" #include "YesNoNone.h" #if USE_SSL diff --git a/src/acl/Acl.h b/src/acl/Acl.h index bc3e70f7e6..8919e51d57 100644 --- a/src/acl/Acl.h +++ b/src/acl/Acl.h @@ -38,7 +38,6 @@ #include "defines.h" #include "dlink.h" #include "MemPool.h" -#include "structs.h" #if HAVE_OSTREAM #include @@ -46,6 +45,7 @@ class ConfigParser; class ACLChecklist; +class ACLList; /// \ingroup ACLAPI class ACL diff --git a/src/acl/DestinationIp.cc b/src/acl/DestinationIp.cc index 101dcf3fb1..ab2967b112 100644 --- a/src/acl/DestinationIp.cc +++ b/src/acl/DestinationIp.cc @@ -38,7 +38,6 @@ #include "comm/Connection.h" #include "HttpRequest.h" #include "SquidConfig.h" -#include "structs.h" char const * ACLDestinationIP::typeString() const diff --git a/src/adaptation/AccessCheck.cc b/src/adaptation/AccessCheck.cc index 0470b005d6..77e5351d58 100644 --- a/src/adaptation/AccessCheck.cc +++ b/src/adaptation/AccessCheck.cc @@ -12,7 +12,6 @@ #include "globals.h" #include "HttpReply.h" #include "HttpRequest.h" -#include "structs.h" /** \cond AUTODOCS-IGNORE */ cbdata_type Adaptation::AccessCheck::CBDATA_AccessCheck = CBDATA_UNKNOWN; diff --git a/src/adaptation/AccessRule.cc b/src/adaptation/AccessRule.cc index 03b9804bd1..28cd2832b7 100644 --- a/src/adaptation/AccessRule.cc +++ b/src/adaptation/AccessRule.cc @@ -1,10 +1,9 @@ #include "squid.h" -#include "structs.h" -#include "ConfigParser.h" #include "acl/Gadgets.h" #include "adaptation/AccessRule.h" #include "adaptation/Service.h" #include "adaptation/ServiceGroups.h" +#include "ConfigParser.h" #include "Debug.h" int Adaptation::AccessRule::LastId = 0; diff --git a/src/adaptation/Config.cc b/src/adaptation/Config.cc index 4d346f7c09..0d3b86940f 100644 --- a/src/adaptation/Config.cc +++ b/src/adaptation/Config.cc @@ -42,7 +42,6 @@ #include "HttpReply.h" #include "HttpRequest.h" #include "Store.h" -#include "structs.h" bool Adaptation::Config::Enabled = false; char *Adaptation::Config::masterx_shared_name = NULL; diff --git a/src/auth/basic/User.cc b/src/auth/basic/User.cc index 5d1fb150c0..0b598f6923 100644 --- a/src/auth/basic/User.cc +++ b/src/auth/basic/User.cc @@ -4,7 +4,6 @@ #include "Debug.h" #include "SquidConfig.h" #include "SquidTime.h" -#include "structs.h" Auth::Basic::User::User(Auth::Config *aConfig) : Auth::User(aConfig), diff --git a/src/auth/digest/User.cc b/src/auth/digest/User.cc index 31bfd63809..03c2edf4ff 100644 --- a/src/auth/digest/User.cc +++ b/src/auth/digest/User.cc @@ -5,7 +5,6 @@ #include "dlink.h" #include "SquidConfig.h" #include "SquidTime.h" -#include "structs.h" Auth::Digest::User::User(Auth::Config *aConfig) : Auth::User(aConfig), diff --git a/src/ip/QosConfig.h b/src/ip/QosConfig.h index 3a3589d486..a5ff90b80b 100644 --- a/src/ip/QosConfig.h +++ b/src/ip/QosConfig.h @@ -3,6 +3,7 @@ #include "hier_code.h" #include "ip/forward.h" +#include "structs.h" #if HAVE_LIBNETFILTER_CONNTRACK_LIBNETFILTER_CONNTRACK_H #include diff --git a/src/ipc/Kids.cc b/src/ipc/Kids.cc index 6a37122501..a5dfddfba3 100644 --- a/src/ipc/Kids.cc +++ b/src/ipc/Kids.cc @@ -8,7 +8,6 @@ #include "ipc/Kids.h" #include "tools.h" #include "SquidConfig.h" -#include "structs.h" Kids TheKids; KidName TheKidName; diff --git a/src/ipc/mem/Pages.cc b/src/ipc/mem/Pages.cc index cd63778e15..779db4fe96 100644 --- a/src/ipc/mem/Pages.cc +++ b/src/ipc/mem/Pages.cc @@ -8,7 +8,6 @@ #include "base/RunnersRegistry.h" #include "ipc/mem/PagePool.h" #include "ipc/mem/Pages.h" -#include "structs.h" #include "SwapDir.h" #include "tools.h" diff --git a/src/log/ModTcp.cc b/src/log/ModTcp.cc index 5238c34e10..5d44b12868 100644 --- a/src/log/ModTcp.cc +++ b/src/log/ModTcp.cc @@ -39,7 +39,6 @@ #include "log/File.h" #include "log/ModTcp.h" #include "Parsing.h" -#include "structs.h" #include "SquidConfig.h" #if HAVE_ERRNO_H diff --git a/src/log/ModUdp.cc b/src/log/ModUdp.cc index b6e6425fe4..cda9e68f3a 100644 --- a/src/log/ModUdp.cc +++ b/src/log/ModUdp.cc @@ -38,7 +38,6 @@ #include "log/File.h" #include "log/ModUdp.h" #include "Parsing.h" -#include "structs.h" #include "SquidConfig.h" #if HAVE_ERRNO_H diff --git a/src/mem.cc b/src/mem.cc index e4895c9225..04934e650d 100644 --- a/src/mem.cc +++ b/src/mem.cc @@ -48,6 +48,7 @@ #include "SquidTime.h" #include "Store.h" #include "StoreEntryStream.h" +#include "structs.h" #if HAVE_IOMANIP #include diff --git a/src/structs.h b/src/structs.h index 93c4a74afc..b98d10c3be 100644 --- a/src/structs.h +++ b/src/structs.h @@ -29,9 +29,6 @@ #ifndef SQUID_STRUCTS_H #define SQUID_STRUCTS_H -#define PEER_MULTICAST_SIBLINGS 1 - -//#include "cbdata.h" #include "defines.h" #include "typedefs.h" diff --git a/src/tests/stub_libcomm.cc b/src/tests/stub_libcomm.cc index a52cd8c776..1bb41ecb7e 100644 --- a/src/tests/stub_libcomm.cc +++ b/src/tests/stub_libcomm.cc @@ -1,6 +1,5 @@ #include "squid.h" #include "base/AsyncJob.h" -#include "structs.h" #define STUB_API "comm/libcomm.la" #include "tests/STUB.h" diff --git a/src/tests/testHttpParser.cc b/src/tests/testHttpParser.cc index 8c6c910331..90b97dcb46 100644 --- a/src/tests/testHttpParser.cc +++ b/src/tests/testHttpParser.cc @@ -7,7 +7,6 @@ #include "HttpParser.h" #include "Mem.h" #include "MemBuf.h" -#include "structs.h" #include "SquidConfig.h" CPPUNIT_TEST_SUITE_REGISTRATION( testHttpParser ); diff --git a/src/wccp.cc b/src/wccp.cc index dd77871620..b43cdb4e57 100644 --- a/src/wccp.cc +++ b/src/wccp.cc @@ -38,7 +38,6 @@ #include "comm/Loops.h" #include "event.h" #include "SquidConfig.h" -#include "structs.h" #define WCCP_PORT 2048 #define WCCP_REVISION 0