moved dread_ctrl to disk.h

diff --git a/src/disk.cc b/src/disk.cc
index 21b127de5b55cdd1ec55f307f8b5b018cfe70062..1e2595acc3217d2288ff6fc5a03534682822edb4 100644 (file)
--- a/src/disk.cc
+++ b/src/disk.cc
@@ -32,6 +32,7 @@
 
 #include "squid.h"
 #include "comm/Loops.h"
+#include "disk.h"
 #include "fd.h"
 #include "fde.h"
 #include "globals.h"

diff --git a/src/disk.h b/src/disk.h
index 847c950014a7ef16faf00647c378f5c51fc51959..9910fdbdeedd2595ba6d797f3211d4cbdbaf8f18 100644 (file)
--- a/src/disk.h
+++ b/src/disk.h
@@ -36,6 +36,20 @@
 #include "typedefs.h"
 
 class MemBuf;
+// POD
+
+class dread_ctrl
+{
+public:
+    int fd;
+    off_t offset;
+    int req_len;
+    char *buf;
+    int end_of_file;
+    DRCB *handler;
+    void *client_data;
+};
+
 
 int file_open(const char *path, int mode);
 void file_close(int fd);

diff --git a/src/mem.cc b/src/mem.cc
index 04934e650dceba1ae9ea6489121fd72769f7f9c0..56cad3e3d4955012888e24b9a64977870e1524f7 100644 (file)
--- a/src/mem.cc
+++ b/src/mem.cc
@@ -35,6 +35,7 @@
 #include "acl/AclNameList.h"
 #include "CacheDigest.h"
 #include "ClientInfo.h"
+#include "disk.h"
 #include "event.h"
 #include "md5.h"
 #include "Mem.h"

diff --git a/src/structs.h b/src/structs.h
index 762927367c0689d6d249acd664b8afd0fe942b3b..0355753f3273d32170479cedc7b8cc277b08b1b6 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -40,19 +40,6 @@ struct acl_size_t {
     int64_t size;
 };
 
-// POD
-class dread_ctrl
-{
-public:
-    int fd;
-    off_t offset;
-    int req_len;
-    char *buf;
-    int end_of_file;
-    DRCB *handler;
-    void *client_data;
-};
-
 // POD
 class dwrite_q
 {