Moved READ_HANDLER from typedefs.h to fde.h

diff --git a/src/RemovalPolicy.h b/src/RemovalPolicy.h
index 343ad361872afb453b836248e8468bd88ce0b410..1ed8abdb6249fa57136b84d6820489ee306b57ec 100644 (file)
--- 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 e3a8c2653ac82959b91561230e84ea582b6d8feb..7b918277c867fe32290422c7bfc5fe9b72d9433e 100644 (file)
--- 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 14007b6117b4c1aec8ca639b7b8d41c8cfc930f8..c6c11c566b148b7ff46114694e6354b3ee786e07 100644 (file)
--- 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 d1be9f0b59c03c56106b5ca7969aa7ca3f631a8e..21a7940f4fac12df4a5959a144ca9c8c2d764e78 100644 (file)
--- 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 */