Move PF declaration from typedefs.h to comm/forward.h

diff --git a/src/StoreIOState.h b/src/StoreIOState.h
index a495bf018bbad51aebbba7940cdce38fe8ea1701..a4b6709ccba7a29bbc7623692e7379a612f9aa71 100644 (file)
--- a/src/StoreIOState.h
+++ b/src/StoreIOState.h
@@ -12,6 +12,7 @@
 #include "base/RefCount.h"
 #include "cbdata.h"
 #include "fs/forward.h"
+#include "mem/forward.h"
 
 class StoreIOState : public RefCountable
 {

diff --git a/src/comm/Loops.h b/src/comm/Loops.h
index 266fcabfba03ed9740354598b4b062aa1af260f0..9c895dc476e3a57ba1c88a3000e83d1739ba18c4 100644 (file)
--- a/src/comm/Loops.h
+++ b/src/comm/Loops.h
@@ -10,9 +10,7 @@
 #define _SQUID_SRC_COMM_LOOPS_H
 
 #include "comm/Flag.h"
-
-// for PF
-#include "typedefs.h"
+#include "comm/forward.h"
 
 /* Comm layer select loops API.
  *

diff --git a/src/comm/forward.h b/src/comm/forward.h
index 0e9d256d7c4b32ce7dbe0462ffff1f41bb7cb49b..571bc8bfe696f18ccc62c2f9d8d5e4bc558bcf0a 100644 (file)
--- a/src/comm/forward.h
+++ b/src/comm/forward.h
@@ -28,5 +28,7 @@ bool IsConnOpen(const Comm::ConnectionPointer &conn);
 
 }; // namespace Comm
 
+typedef void PF(int, void *);
+
 #endif /* _SQUID_COMM_FORWARD_H */
 

diff --git a/src/typedefs.h b/src/typedefs.h
index 7d196737e5622251fbedf1e60590ee5cef3431e9..a157c6a6c9eb11c28a989c2aa0410e9fcc44caf5 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -16,8 +16,6 @@ typedef struct {
     size_t kb;
 } kb_t;
 
-typedef void PF(int, void *);
-
 /* disk.c / diskd.c callback typedefs */
 typedef void DRCB(int, const char *buf, int size, int errflag, void *data);
 /* Disk read CB */