Moved some prototypes to disk.h

diff --git a/src/disk.h b/src/disk.h
index 6848004e156829f8de126ff93179f7cc435ab5f0..e29185c9270a125d25bebb691a8a20f72ac5acfa 100644 (file)
--- a/src/disk.h
+++ b/src/disk.h
@@ -34,7 +34,25 @@
 #ifndef SQUID_DISK_H_
 #define SQUID_DISK_H_
 
+#include "typedefs.h"
+
+class MemBuf;
+
 extern int file_open(const char *path, int mode);
 extern void file_close(int fd);
 
+/* Adapter file_write for object callbacks */
+template <class O>
+void
+FreeObject(void *address)
+{
+    O *anObject = static_cast <O *>(address);
+    delete anObject;
+}
+
+extern void file_write(int, off_t, void const *, int len, DWCB *, void *, FREE *);
+extern void file_write_mbuf(int fd, off_t, MemBuf mb, DWCB * handler, void *handler_data);
+extern void file_read(int, char *, int, off_t, DRCB *, void *);
+extern void disk_init(void);
+
 #endif /* SQUID_DISK_H_ */

diff --git a/src/protos.h b/src/protos.h
index c4a1511b43317d32b2d048b99acaadc78c830a8b..8c92295947a49d516de150bb581da467b1760436 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -51,20 +51,6 @@ class HttpRequestMethod;
 class ClientInfo;
 #endif
 
-/* Adapter file_write for object callbacks */
-
-template <class O>
-void
-FreeObject(void *address)
-{
-    O *anObject = static_cast <O *>(address);
-    delete anObject;
-}
-
-SQUIDCEXTERN void file_write(int, off_t, void const *, int len, DWCB *, void *, FREE *);
-SQUIDCEXTERN void file_write_mbuf(int fd, off_t, MemBuf mb, DWCB * handler, void *handler_data);
-SQUIDCEXTERN void file_read(int, char *, int, off_t, DRCB *, void *);
-SQUIDCEXTERN void disk_init(void);
 
 extern void fd_close(int fd);
 extern void fd_open(int fd, unsigned int type, const char *);