From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Fri, 28 Aug 2015 20:03:05 +0000 (+0200)
Subject: Moved cache_key from typedefs.h to store_key_md5.h
X-Git-Tag: SQUID_4_0_1~81^2~10^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1ba42a40996a4b4b0e4f00cdc9815b319d4a7bc;p=thirdparty%2Fsquid.git

Moved cache_key from typedefs.h to store_key_md5.h
---

diff --git a/src/CacheDigest.h b/src/CacheDigest.h
index 14bf039092..3885ef91ea 100644
--- 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 e554e6e17a..101f401900 100644
--- 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 1615e2bdea..fc11fee116 100644
--- 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 065820dddb..658e15deab 100644
--- 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 69b5de6772..2a913340ae 100644
--- 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 8ce03761c2..79d186b142 100644
--- 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 1ed8abdb62..9b0bed615f 100644
--- 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 28e528bb93..58ca79787c 100644
--- 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 5a94aebdc1..4cae860ffe 100644
--- 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 7b918277c8..2ba72ff8c7 100644
--- 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 484bf33c65..c86e4906e6 100644
--- 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 92a361e09a..2f8e1ee722 100644
--- 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 775d4e7fbe..051f2af999 100644
--- 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 1f91915623..e799d49f80 100644
--- 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 0cdce573b8..6170314cd2 100644
--- 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 af599d87bf..3933c7a47f 100644
--- 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 05956a4ce8..b8125e117d 100644
--- 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 ffd4f23477..9624a99844 100644
--- 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 */