From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Fri, 28 Aug 2015 15:16:42 +0000 (+0200)
Subject: Move PF declaration from typedefs.h to comm/forward.h
X-Git-Tag: SQUID_4_0_1~81^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=effdd84138dbf45676b219ab9531fe4d08cba060;p=thirdparty%2Fsquid.git

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

diff --git a/src/StoreIOState.h b/src/StoreIOState.h
index a495bf018b..a4b6709ccb 100644
--- 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 266fcabfba..9c895dc476 100644
--- 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 0e9d256d7c..571bc8bfe6 100644
--- 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 7d196737e5..a157c6a6c9 100644
--- 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 */