From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 27 Apr 2009 06:40:06 +0000 (+1200)
Subject: Fix dependencies in DiskIO
X-Git-Tag: SQUID_3_2_0_1~1037
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=02529124e652ce846411b223e218617256639358;p=thirdparty%2Fsquid.git

Fix dependencies in DiskIO

It appears the slightly broken teastheaders was previously hiding
several header definition and protection bugs. Now found and fixed.
---

diff --git a/src/DiskIO/AIO/aio_win32.h b/src/DiskIO/AIO/aio_win32.h
index 807fc45153..ee7ba626c3 100644
--- a/src/DiskIO/AIO/aio_win32.h
+++ b/src/DiskIO/AIO/aio_win32.h
@@ -1,4 +1,3 @@
-
 /*
  * $Id$
  *
@@ -35,6 +34,8 @@
 #ifndef __WIN32_AIO_H__
 #define __WIN32_AIO_H__
 
+#include "config.h"
+
 #ifdef _SQUID_CYGWIN_
 #include "squid_windows.h"
 #endif
@@ -44,6 +45,7 @@ typedef int64_t	off64_t;
 #endif
 
 #ifdef _SQUID_MSWIN_
+
 union sigval {
     int sival_int; /* integer value */
     void *sival_ptr; /* pointer value */
@@ -55,7 +57,7 @@ struct sigevent {
     union sigval sigev_value; /* signal value */
 };
 
-#endif
+// #endif
 
 struct aiocb64 {
     int aio_fildes; /* file descriptor */
@@ -104,4 +106,5 @@ int aio_error64(const struct aiocb64 *);
 int aio_open(const char *, int);
 void aio_close(int);
 
-#endif
+#endif /* _SQUID_MSWIN_ */
+#endif /* __WIN32_AIO_H__ */
diff --git a/src/DiskIO/AIO/async_io.h b/src/DiskIO/AIO/async_io.h
index b238c36021..f2c1f45cfa 100644
--- a/src/DiskIO/AIO/async_io.h
+++ b/src/DiskIO/AIO/async_io.h
@@ -1,11 +1,15 @@
 #ifndef __ASYNC_IO_H__
 #define __ASYNC_IO_H__
+
 #ifdef _SQUID_WIN32_
 #include "aio_win32.h"
 #else
 #include <aio.h>
 #endif
 
+/* for FREE* */
+#include "typedefs.h"
+
 #define MAX_ASYNCOP		128
 
 typedef enum {
diff --git a/src/DiskIO/DiskDaemon/DiskdIOStrategy.h b/src/DiskIO/DiskDaemon/DiskdIOStrategy.h
index 161d7edde7..6bc70e9241 100644
--- a/src/DiskIO/DiskDaemon/DiskdIOStrategy.h
+++ b/src/DiskIO/DiskDaemon/DiskdIOStrategy.h
@@ -36,6 +36,8 @@
 #ifndef __STORE_DISKDIOSTRATEGY_H__
 #define __STORE_DISKDIOSTRATEGY_H__
 
+#include "config.h"
+
 struct diomsg;
 
 /// \ingroup diskd
diff --git a/src/DiskIO/DiskDaemon/diomsg.h b/src/DiskIO/DiskDaemon/diomsg.h
index cd8fa2327f..5827fdbbd7 100644
--- a/src/DiskIO/DiskDaemon/diomsg.h
+++ b/src/DiskIO/DiskDaemon/diomsg.h
@@ -7,6 +7,8 @@
 #ifndef __SQUID_DIOMSG_H__
 #define __SQUID_DIOMSG_H__
 
+#include "config.h"
+
 enum {
     _MQD_NOP,
     _MQD_OPEN,
@@ -33,5 +35,4 @@ struct diomsg {
     static const int msg_snd_rcv_sz;
 };
 
-
-#endif
+#endif /* __SQUID_DIOMSG_H__ */
diff --git a/src/DiskIO/DiskThreads/DiskThreads.h b/src/DiskIO/DiskThreads/DiskThreads.h
index 9df66ca457..8654257ed7 100644
--- a/src/DiskIO/DiskThreads/DiskThreads.h
+++ b/src/DiskIO/DiskThreads/DiskThreads.h
@@ -7,6 +7,10 @@
 #ifndef __DISKTHREADS_H__
 #define __DISKTHREADS_H__
 
+#include "config.h"
+#include "dlink.h"
+#include "typedefs.h"
+
 #ifdef AUFS_IO_THREADS
 #define NUMTHREADS AUFS_IO_THREADS
 #else