Moved FREE declaration from typedefs.h to mem/forward.h

diff --git a/src/DiskIO/AIO/async_io.h b/src/DiskIO/AIO/async_io.h
index 3428c449b4e06b1986b9654ea8a4c3d7e2175e56..e7f5a17f87128f30e7dd854f94898eab08b9d51f 100644 (file)
--- a/src/DiskIO/AIO/async_io.h
+++ b/src/DiskIO/AIO/async_io.h
@@ -19,8 +19,7 @@
 #endif
 #endif
 
-/* for FREE* */
-#include "typedefs.h"
+#include "mem/forward.h"
 
 #define MAX_ASYNCOP     128
 

diff --git a/src/DiskIO/DiskThreads/DiskThreads.h b/src/DiskIO/DiskThreads/DiskThreads.h
index f527cb833b696cca6c50303570dc411d3fa79c22..669512898069b2c9c393ff6047d0ef16569ce3b4 100644 (file)
--- a/src/DiskIO/DiskThreads/DiskThreads.h
+++ b/src/DiskIO/DiskThreads/DiskThreads.h
@@ -16,7 +16,7 @@
 #define __DISKTHREADS_H__
 
 #include "dlink.h"
-#include "typedefs.h"
+#include "mem/forward.h"
 
 /* this non-standard-conformant include is needed in order to have stat(2) and struct stat
    properly defined on some systems (e.g. OpenBSD 5.4) */

diff --git a/src/DiskIO/WriteRequest.h b/src/DiskIO/WriteRequest.h
index d47b69a21e5948df31c9fa0cf92c3a8e592d739b..c8753149857c72b8e64eea7e16f336159f1af8f2 100644 (file)
--- a/src/DiskIO/WriteRequest.h
+++ b/src/DiskIO/WriteRequest.h
@@ -11,6 +11,7 @@
 
 #include "base/RefCount.h"
 #include "cbdata.h"
+#include "mem/forward.h"
 
 class WriteRequest : public RefCountable
 {

diff --git a/src/MemBuf.h b/src/MemBuf.h
index 2049497d24effe690dba911a3c8be745cfb1a1bf..9c87281f272152793d51fd60e6ae156021caef9d 100644 (file)
--- a/src/MemBuf.h
+++ b/src/MemBuf.h
@@ -11,6 +11,7 @@
 
 #include "base/Packable.h"
 #include "cbdata.h"
+#include "mem/forward.h"
 
 /**
  * Auto-growing memory-resident buffer with Packable interface

diff --git a/src/comm/IoCallback.h b/src/comm/IoCallback.h
index b97ca72965ab8bb61d3a7d0eef0e8b8f8305278c..36255c0696943eee02bf7e268cef2ac4c5e1f05a 100644 (file)
--- a/src/comm/IoCallback.h
+++ b/src/comm/IoCallback.h
@@ -12,7 +12,7 @@
 #include "base/AsyncCall.h"
 #include "comm/Flag.h"
 #include "comm/forward.h"
-#include "typedefs.h"
+#include "mem/forward.h"
 
 class SBuf;
 

diff --git a/src/comm/Write.h b/src/comm/Write.h
index 8081f3617e53480f3529e1d3b87737272eea7ef3..93e3c64016238ed04b45734ae3f9ba5764ede543 100644 (file)
--- a/src/comm/Write.h
+++ b/src/comm/Write.h
@@ -11,7 +11,8 @@
 
 #include "base/AsyncCall.h"
 #include "comm/forward.h"
-#include "typedefs.h"
+#include "mem/forward.h"
+#include "typedefs.h" //for PF
 
 class MemBuf;
 namespace Comm

diff --git a/src/disk.h b/src/disk.h
index 9fbb88e004989a0bc87eaf9c38d0f29b2e611ef4..1ea7f1debb156952c166a5190259a99ddea5b2b5 100644 (file)
--- a/src/disk.h
+++ b/src/disk.h
@@ -11,7 +11,8 @@
 #ifndef SQUID_DISK_H_
 #define SQUID_DISK_H_
 
-#include "typedefs.h"
+#include "mem/forward.h"
+#include "typedefs.h" //DRCB, DWCB
 
 class MemBuf;
 

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

diff --git a/src/mem/forward.h b/src/mem/forward.h
index c7d262e8672af273bf6775c5c469323d0e5d2318..4dca6bc92a9eca11ca515fb92333f598805ad8d5 100644 (file)
--- a/src/mem/forward.h
+++ b/src/mem/forward.h
@@ -12,8 +12,6 @@
 #define _SQUID_SRC_MEM_FORWARD_H
 
 #include "mem/AllocatorProxy.h"
-/* for FREE */
-#include "typedefs.h"
 
 #include <iosfwd>
 
@@ -34,6 +32,8 @@ void PoolReport(const MemPoolStats * mp_st, const MemPoolMeter * AllMeter, std::
 
 extern const size_t squidSystemPageSize;
 
+typedef void FREE(void *);
+
 /// Types of memory pool which do not yet use MEMPROXY_CLASS() API
 typedef enum {
     MEM_NONE,

diff --git a/src/typedefs.h b/src/typedefs.h
index a84e64348db0a1449e078833ba8fc2b227b989ec..7d196737e5622251fbedf1e60590ee5cef3431e9 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -16,7 +16,6 @@ typedef struct {
     size_t kb;
 } kb_t;
 
-typedef void FREE(void *);
 typedef void PF(int, void *);
 
 /* disk.c / diskd.c callback typedefs */