From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Fri, 28 Aug 2015 18:42:11 +0000 (+0200)
Subject: Moved READ_HANDLER from typedefs.h to fde.h
X-Git-Tag: SQUID_4_0_1~81^2~10^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=541b581e1e1e5c63f8f0a9b3887b4fa40f5bdd85;p=thirdparty%2Fsquid.git

Moved READ_HANDLER from typedefs.h to fde.h
---

diff --git a/src/RemovalPolicy.h b/src/RemovalPolicy.h
index 343ad36187..1ed8abdb62 100644
--- a/src/RemovalPolicy.h
+++ b/src/RemovalPolicy.h
@@ -13,6 +13,7 @@
 
 class RemovalPolicyWalker;
 class RemovalPurgeWalker;
+class wordlist;
 
 class RemovalPolicySettings
 {
diff --git a/src/fde.h b/src/fde.h
index e3a8c2653a..7b918277c8 100644
--- a/src/fde.h
+++ b/src/fde.h
@@ -19,6 +19,12 @@
 class ClientInfo;
 #endif
 
+/**
+ * READ_HANDLER functions return < 0 if, and only if, they fail with an error.
+ * On error, they must pass back an error code in 'errno'.
+ */
+typedef int READ_HANDLER(int, char *, int);
+
 /**
  * WRITE_HANDLER functions return < 0 if, and only if, they fail with an error.
  * On error, they must pass back an error code in 'errno'.
diff --git a/src/helper.h b/src/helper.h
index 14007b6117..c6c11c566b 100644
--- a/src/helper.h
+++ b/src/helper.h
@@ -25,6 +25,7 @@
 #include <map>
 
 class Packable;
+class wordlist;
 
 /// callback type for helper empty-queue event
 typedef void HLPSONEQ(void *);
diff --git a/src/typedefs.h b/src/typedefs.h
index d1be9f0b59..21a7940f4f 100644
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -25,11 +25,6 @@ typedef void DWCB(int, int, size_t, void *);    /* disk write CB */
 class CachePeer;
 typedef void IRCB(CachePeer *, peer_t, AnyP::ProtocolType, void *, void *data);
 
-/**
- * READ_HANDLER functions return < 0 if, and only if, they fail with an error.
- * On error, they must pass back an error code in 'errno'.
- */
-typedef int READ_HANDLER(int, char *, int);
 
 
 typedef int QS(const void *, const void *); /* qsort */