Removed now-useless inclusions of structs.h in various places.

diff --git a/src/CacheDigest.cc b/src/CacheDigest.cc
index 5ca1ccd31ab0eb97f98f4be3193e95f69b42a8ff..b51cb3e4ff518c6a7fcb89f4e7e2427e53290bcb 100644 (file)
--- 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 3a1aeb4a3839b1dffd77f21526a8a2ee16230764..bb5885557f82c6cfb1d12ed08f065138660a33d7 100644 (file)
--- 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 <vector>
 
 /**

diff --git a/src/CachePeer.h b/src/CachePeer.h
index 94067ec9e8e6ded9e06d92f2acd49fb7a795cf80..50cea94978a74178890447079dba34f7f142c671 100644 (file)
--- 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 <openssl/ssl.h>
 #endif

diff --git a/src/CpuAffinity.cc b/src/CpuAffinity.cc
index 9d5f2fbdc041b28bcc60092bcf39f8f39b40bf5a..54f500fa906b623036656adc354d277d039a3533 100644 (file)
--- 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 <algorithm>

diff --git a/src/HttpParser.cc b/src/HttpParser.cc
index 0ef9ed3b0bf393d4f620ebebe103b14ce450afd9..39ebeb30449b32c70372e522382d5007a65f501d 100644 (file)
--- 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 5782f2dc6546a078bac91fde5cc9aac7cda3689e..44bdc5a671f0d469e359214a41d6f91a6ff03a9f 100644 (file)
--- 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 0a3bd3bf717e27c43a04865fee5bacb86727b91f..11090dc22975a66043f896afc21a72813101f375 100644 (file)
--- 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 eaa3b94aee324255012a067a718dd8b0201c3d41..131eb25c21568facdf8af2a6fe6cc5cc2e749234 100644 (file)
--- 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 bc3e70f7e66ec472f4579d68b8c5e9f425acccdb..8919e51d57aa48f26d238afbf52b7b6111ad3f43 100644 (file)
--- 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 <ostream>
@@ -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 101dcf3fb1c2d6a7eb1864abe2ec55fb93e9f6ba..ab2967b112187a9c0ab0327c8bb0ebb834fed2c1 100644 (file)
--- 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 0470b005d62133573ecefedc1d6caf7ad671afec..77e5351d58f7d6986b9330e0771433ffb6cadf92 100644 (file)
--- 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 03b9804bd191d21461d1c3e8708c81204ecce083..28cd2832b71d77d9cac6758cc725c990b2fc7256 100644 (file)
--- 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 4d346f7c0951ba8f5831e57fd195747157cc9b55..0d3b86940f82c895c4e973cca81536bafe3e6536 100644 (file)
--- 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 5d1fb150c074ce123986b771a15d3075aed2f140..0b598f6923c1460d7148c793a8a9b970793c4e7a 100644 (file)
--- 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 31bfd638096bd9d11203b06fedbb14b140d292e7..03c2edf4ff8f83f63a2cadaaf735076a1b8f218e 100644 (file)
--- 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 3a3589d486db52b992ddf69cc481e054e9f229b6..a5ff90b80bd486510c1cb812aa104988d237a140 100644 (file)
--- 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 <libnetfilter_conntrack/libnetfilter_conntrack.h>

diff --git a/src/ipc/Kids.cc b/src/ipc/Kids.cc
index 6a371225016887baffceaf501c4cdc17608a3fd8..a5dfddfba34b90a771db38b0c4523b6cdd155a38 100644 (file)
--- 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 cd63778e1508c7745f5d098c574ac78daba1700a..779db4fe96b86bfc3cb70bf5923d0b0338a19c4f 100644 (file)
--- 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 5238c34e1050b9e022da60577568df82cac839b3..5d44b1286879320e6852857beee8cfcf8b3ba096 100644 (file)
--- 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 b6e6425fe4aa64b56b8f8b463df118b868217c28..cda9e68f3a67a9ba0a31958af15e6e034cea936b 100644 (file)
--- 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 e4895c922504a0022615d5ed860d00ab06449ff6..04934e650dceba1ae9ea6489121fd72769f7f9c0 100644 (file)
--- 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 <iomanip>

diff --git a/src/structs.h b/src/structs.h
index 93c4a74afc6bff4b43822a4f138bcaadbe5044ff..b98d10c3beb579ca156708858429ccc3ae724572 100644 (file)
--- 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 a52cd8c77602829a29e4a317434c666463e0cb5c..1bb41ecb7ebbaffa8ceaf0ac9e670883a86bfd32 100644 (file)
--- 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 8c6c910331fd9e658d09fb16ca9c8028ec57604b..90b97dcb465c1376e4723fb4574e755e23a18338 100644 (file)
--- 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 dd778716200b4f2cf8971a5f8c12009b14980ed2..b43cdb4e574e0bac8a9193ba98725d592745c1dc 100644 (file)
--- 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