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

diff --git a/src/errorpage.h b/src/errorpage.h
index 49d37e1c9d75084b0be780ca8f8a47187b85c904..320b03285c1bd4aa63a722c68ca0c56b2f1b7d04 100644 (file)
--- 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 e53d0e79c29217d6b2eb0b0fb0633850a5f91550..5c282678386a1e8a55712f0a5820379f42964e34 100644 (file)
--- 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 b17c48a0966ac63b3d1bb85d7018464ac3bbcbed..2068e78dbef78dfb6b52e0331b89c1e0df43ad05 100644 (file)
--- 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);