Moved cache_key from typedefs.h to store_key_md5.h

diff --git a/src/CacheDigest.h b/src/CacheDigest.h
index 14bf039092cef5cff848496134ec6fdb54250c76..3885ef91ea8949af74cf65af9247582276d802e3 100644 (file)
--- a/src/CacheDigest.h
+++ b/src/CacheDigest.h
@@ -12,7 +12,7 @@
 #define SQUID_CACHEDIGEST_H_
 
 /* for cache_key */
-#include "typedefs.h"
+#include "store_key_md5.h"
 
 class CacheDigestGuessStats;
 class StoreEntry;

diff --git a/src/DiskIO/Blocking/BlockingFile.h b/src/DiskIO/Blocking/BlockingFile.h
index e554e6e17a42152e637ca56858680b216c7c54f1..101f4019001148cd0ad1b503d8db0caf0b790f0c 100644 (file)
--- a/src/DiskIO/Blocking/BlockingFile.h
+++ b/src/DiskIO/Blocking/BlockingFile.h
@@ -14,6 +14,7 @@
 #include "cbdata.h"
 #include "DiskIO/DiskFile.h"
 #include "DiskIO/IORequestor.h"
+#include "typedefs.h" //DRCB, DWCB
 
 class BlockingFile : public DiskFile
 {

diff --git a/src/DiskIO/DiskThreads/DiskThreadsDiskFile.h b/src/DiskIO/DiskThreads/DiskThreadsDiskFile.h
index 1615e2bdeaa907cca0df672aa063728dd557c399..fc11fee11616818f27f01740a5d2e9a95afb7144 100644 (file)
--- a/src/DiskIO/DiskThreads/DiskThreadsDiskFile.h
+++ b/src/DiskIO/DiskThreads/DiskThreadsDiskFile.h
@@ -13,6 +13,7 @@
 #include "cbdata.h"
 #include "DiskIO/DiskFile.h"
 #include "DiskThreads.h"
+#include "typedefs.h" //for DWCB
 
 class DiskThreadsDiskFile : public DiskFile
 {

diff --git a/src/HttpMsg.h b/src/HttpMsg.h
index 065820dddb6de19b00759d9278be9cf8de64d54c..658e15deab8d98e10fefae77a1b12cf9decb290e 100644 (file)
--- a/src/HttpMsg.h
+++ b/src/HttpMsg.h
@@ -11,6 +11,7 @@
 
 #include "base/Lock.h"
 #include "BodyPipe.h"
+#include "enums.h"
 #include "http/forward.h"
 #include "http/ProtocolVersion.h"
 #include "http/StatusCode.h"

diff --git a/src/ICP.h b/src/ICP.h
index 69b5de6772233368eb7a371b698fcc6027c79fba..2a913340aeb3db96273db6f5786c03d1d7689a29 100644 (file)
--- a/src/ICP.h
+++ b/src/ICP.h
@@ -19,6 +19,7 @@
 #include "ip/Address.h"
 #include "LogTags.h"
 #include "StoreClient.h"
+#include "store_key_md5.h"
 
 class HttpRequest;
 

diff --git a/src/MemObject.h b/src/MemObject.h
index 8ce03761c2a44269d59dc908e3020370a70d1687..79d186b1425663e76e5544f8d1f94a8d010102ae 100644 (file)
--- a/src/MemObject.h
+++ b/src/MemObject.h
@@ -16,6 +16,7 @@
 #include "stmem.h"
 #include "StoreIOBuffer.h"
 #include "StoreIOState.h"
+#include "typedefs.h" //for IRCB
 
 #if USE_DELAY_POOLS
 #include "DelayId.h"

diff --git a/src/RemovalPolicy.h b/src/RemovalPolicy.h
index 1ed8abdb6249fa57136b84d6820489ee306b57ec..9b0bed615f1570e8a030c9839b3c563c641f70e3 100644 (file)
--- a/src/RemovalPolicy.h
+++ b/src/RemovalPolicy.h
@@ -14,6 +14,7 @@
 class RemovalPolicyWalker;
 class RemovalPurgeWalker;
 class wordlist;
+class StoreEntry;
 
 class RemovalPolicySettings
 {

diff --git a/src/Store.h b/src/Store.h
index 28e528bb9307a1788cd6a5af633c12d8e902c905..58ca79787c89ad18533c689e28ea8f0253bd3b43 100644 (file)
--- a/src/Store.h
+++ b/src/Store.h
@@ -20,6 +20,7 @@
 #include "MemObject.h"
 #include "Range.h"
 #include "RemovalPolicy.h"
+#include "store_key_md5.h"
 #include "StoreIOBuffer.h"
 #include "StoreStats.h"
 

diff --git a/src/cbdata.h b/src/cbdata.h
index 5a94aebdc1dc7d84f210fde1510c3d0dcfc536db..4cae860ffe8c92d8eb280e7a9cc14346e573d7e3 100644 (file)
--- a/src/cbdata.h
+++ b/src/cbdata.h
@@ -9,8 +9,6 @@
 #ifndef SQUID_SRC_CBDATA_H
 #define SQUID_SRC_CBDATA_H
 
-#include "typedefs.h"
-
 /**
 \page CBDATA Callback Data Allocator API
 

diff --git a/src/fde.h b/src/fde.h
index 7b918277c867fe32290422c7bfc5fe9b72d9433e..2ba72ff8c770a191e9e82a9516b32a928b08388f 100644 (file)
--- a/src/fde.h
+++ b/src/fde.h
@@ -14,6 +14,7 @@
 #include "ip/Address.h"
 #include "ip/forward.h"
 #include "security/forward.h"
+#include "typedefs.h" //DRCB, DWCB
 
 #if USE_DELAY_POOLS
 class ClientInfo;

diff --git a/src/htcp.h b/src/htcp.h
index 484bf33c659dbaabafc4a534d067b48c38dc518a..c86e4906e6c3a8216dcb534bc8ec6e4f6842b92c 100644 (file)
--- a/src/htcp.h
+++ b/src/htcp.h
@@ -14,6 +14,7 @@
 #include "http/forward.h"
 #include "HttpHeader.h"
 #include "ip/forward.h"
+#include "store_key_md5.h"
 
 /// \ingroup ServerProtocolHTCP
 class HtcpReplyData

diff --git a/src/ipc/MemMap.h b/src/ipc/MemMap.h
index 92a361e09a60f4160368468f2bb3ab79675449c9..2f8e1ee722e5d3da2a6d9f570344b13e77607789 100644 (file)
--- a/src/ipc/MemMap.h
+++ b/src/ipc/MemMap.h
@@ -14,6 +14,7 @@
 #include "ipc/mem/Pointer.h"
 #include "ipc/ReadWriteLock.h"
 #include "SBuf.h"
+#include "store_key_md5.h"
 #include "tools.h"
 #include "fs/forward.h"
 

diff --git a/src/ipc/StoreMap.h b/src/ipc/StoreMap.h
index 775d4e7fbe6c3513f39a8aa49c55388f41e14e2b..051f2af999f44b6b11f6f54eb8fd363486892412 100644 (file)
--- a/src/ipc/StoreMap.h
+++ b/src/ipc/StoreMap.h
@@ -14,7 +14,7 @@
 #include "ipc/ReadWriteLock.h"
 #include "SBuf.h"
 #include "fs/forward.h"
-#include "typedefs.h" //cache_key
+#include "store_key_md5.h"
 
 namespace Ipc
 {

diff --git a/src/neighbors.h b/src/neighbors.h
index 1f91915623e4048d502ecdddd114b43f8cee0d66..e799d49f803cc038cbabdf02c60594a3b6da7e7b 100644 (file)
--- a/src/neighbors.h
+++ b/src/neighbors.h
@@ -14,6 +14,7 @@
 #include "enums.h"
 #include "ICP.h"
 #include "lookup_t.h"
+#include "typedefs.h" //for IRCB
 
 class HttpRequest;
 class HttpRequestMethod;

diff --git a/src/store_key_md5.h b/src/store_key_md5.h
index 0cdce573b8ead9f9a17c9e58efed373a7bf4033c..6170314cd2bbdb53ce6016be26091e61f5044e35 100644 (file)
--- a/src/store_key_md5.h
+++ b/src/store_key_md5.h
@@ -12,11 +12,13 @@
 #define SQUID_STORE_KEY_MD5_H_
 
 #include "hash.h"
-#include "typedefs.h"
 
 class HttpRequestMethod;
 class HttpRequest;
 
+/* MD5 cache keys */
+typedef unsigned char cache_key;
+
 cache_key *storeKeyDup(const cache_key *);
 cache_key *storeKeyCopy(cache_key *, const cache_key *);
 void storeKeyFree(const cache_key *);

diff --git a/src/store_rebuild.h b/src/store_rebuild.h
index af599d87bf6c954d897c8b8b7e11771fef8bdfbb..3933c7a47fa148e465cb3a94ad44adbba34c79d6 100644 (file)
--- a/src/store_rebuild.h
+++ b/src/store_rebuild.h
@@ -11,6 +11,8 @@
 #ifndef SQUID_STORE_REBUILD_H_
 #define SQUID_STORE_REBUILD_H_
 
+#include "store_key_md5.h"
+
 class StoreRebuildData
 {
 public:

diff --git a/src/tests/stub_CacheDigest.cc b/src/tests/stub_CacheDigest.cc
index 05956a4ce8b313207e08b66ccd1527138d35c2b9..b8125e117d9eaa7c1c0b3b40152a56af8e4c3506 100644 (file)
--- a/src/tests/stub_CacheDigest.cc
+++ b/src/tests/stub_CacheDigest.cc
@@ -7,7 +7,7 @@
  */
 
 #include "squid.h"
-#include "typedefs.h" /* for cache_key */
+#include "store_key_md5.h" /* for cache_key */
 
 #define STUB_API "CacheDigest.cc"
 #include "tests/STUB.h"

diff --git a/src/typedefs.h b/src/typedefs.h
index ffd4f23477b9d5502f2f4f84f145645bb7da8f36..9624a99844f2edff81c38ad3b15bac134d2b0b70 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -27,8 +27,5 @@ typedef void IRCB(CachePeer *, peer_t, AnyP::ProtocolType, void *, void *data);
 
 class StoreEntry;
 
-/* MD5 cache keys */
-typedef unsigned char cache_key;
-
 #endif /* SQUID_TYPEDEFS_H */