From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Thu, 27 Aug 2015 16:53:12 +0000 (+0200)
Subject: Moved typedefs.h:WRITE_HANDLER to fde.h, and ERCB to errorpage.h
X-Git-Tag: SQUID_4_0_1~81^2~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=822c0041a962bffb21f804c3cc2d8cfba6a7e950;p=thirdparty%2Fsquid.git

Moved typedefs.h:WRITE_HANDLER to fde.h, and ERCB to errorpage.h
---

diff --git a/src/errorpage.h b/src/errorpage.h
index 49d37e1c9d..320b03285c 100644
--- a/src/errorpage.h
+++ b/src/errorpage.h
@@ -24,6 +24,9 @@
 #include "ssl/ErrorDetail.h"
 #endif
 
+/// error page callback
+typedef void ERCB(int fd, void *, size_t);
+
 /**
  \defgroup ErrorPageAPI Error Pages API
  \ingroup Components
diff --git a/src/fde.h b/src/fde.h
index e53d0e79c2..5c28267838 100644
--- a/src/fde.h
+++ b/src/fde.h
@@ -18,6 +18,12 @@
 class ClientInfo;
 #endif
 
+/**
+ * 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'.
+ */
+typedef int WRITE_HANDLER(int, const char *, int);
+
 class dwrite_q;
 class _fde_disk
 {
diff --git a/src/typedefs.h b/src/typedefs.h
index b17c48a096..2068e78dbe 100644
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -58,15 +58,9 @@ typedef void UH(void *data, wordlist *);
  */
 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'.
- */
-typedef int WRITE_HANDLER(int, const char *, int);
 
 typedef int QS(const void *, const void *); /* qsort */
 typedef void STABH(void *);
-typedef void ERCB(int fd, void *, size_t);
 class StoreEntry;
 typedef void SIGHDLR(int sig);
 typedef void STVLDCB(void *, int, int);