From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Fri, 28 Aug 2015 14:43:37 +0000 (+0200)
Subject: Moved FREE declaration from typedefs.h to mem/forward.h
X-Git-Tag: SQUID_4_0_1~81^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6f5dc9e4d49314382a9d5a7f39778c9b69bb38cf;p=thirdparty%2Fsquid.git

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 3428c449b4..e7f5a17f87 100644
--- 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 f527cb833b..6695128980 100644
--- 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 d47b69a21e..c875314985 100644
--- 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 2049497d24..9c87281f27 100644
--- 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 b97ca72965..36255c0696 100644
--- 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 8081f3617e..93e3c64016 100644
--- 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 9fbb88e004..1ea7f1debb 100644
--- 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 2073a8f888..775d4e7fbe 100644
--- 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 c7d262e867..4dca6bc92a 100644
--- 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 a84e64348d..7d196737e5 100644
--- 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 */