---------------------
PatchSet 3609 
Date: 2006/08/29 20:13:50
Author: serassio
Branch: nt
Tag: (none) 
Log:
Import latest changes from AIO and DiskThreads

Members: 
	src/DiskIO/WinAIO/WinAIODiskFile.h:1.1.2.1->1.1.2.2 
	src/DiskIO/WinAIO/Winaio.cc:1.1.2.3->1.1.2.4 
	src/DiskIO/WinDiskThreads/WinDiskThreadsDiskFile.h:1.1.2.1->1.1.2.2 
	src/DiskIO/WinDiskThreads/aiops.cc:1.1.2.7->1.1.2.8 

Index: squid3/src/DiskIO/WinAIO/WinAIODiskFile.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/DiskIO/WinAIO/Attic/WinAIODiskFile.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- squid3/src/DiskIO/WinAIO/WinAIODiskFile.h	26 Dec 2004 09:23:30 -0000	1.1.2.1
+++ squid3/src/DiskIO/WinAIO/WinAIODiskFile.h	29 Aug 2006 20:13:50 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: WinAIODiskFile.h,v 1.1.2.1 2004/12/26 09:23:30 serassio Exp $
+ * $Id: WinAIODiskFile.h,v 1.1.2.2 2006/08/29 20:13:50 serassio Exp $
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------
@@ -36,6 +36,7 @@
 
 #include "DiskIO/DiskFile.h"
 #include "async_io.h"
+#include "cbdata.h"
 
 class WinAIODiskIOStrategy;
 
Index: squid3/src/DiskIO/WinAIO/Winaio.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/DiskIO/WinAIO/Attic/Winaio.cc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- squid3/src/DiskIO/WinAIO/Winaio.cc	1 Jan 2005 20:10:04 -0000	1.1.2.3
+++ squid3/src/DiskIO/WinAIO/Winaio.cc	29 Aug 2006 20:13:50 -0000	1.1.2.4
@@ -1,6 +1,6 @@
 
 /*
- * $Id: Winaio.cc,v 1.1.2.3 2005/01/01 20:10:04 serassio Exp $
+ * $Id: Winaio.cc,v 1.1.2.4 2006/08/29 20:13:50 serassio Exp $
  *
  * DEBUG: section 81    aio_xxx() POSIX emulation on WIN32 for COSS
  * AUTHOR: Guido Serassio
@@ -34,6 +34,7 @@
  */
 
 #include "squid.h"
+#include "comm.h"
 #include "Winaio.h"
 
 #ifdef _SQUID_WIN32_
Index: squid3/src/DiskIO/WinDiskThreads/WinDiskThreadsDiskFile.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/DiskIO/WinDiskThreads/Attic/WinDiskThreadsDiskFile.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- squid3/src/DiskIO/WinDiskThreads/WinDiskThreadsDiskFile.h	1 Jan 2005 18:54:31 -0000	1.1.2.1
+++ squid3/src/DiskIO/WinDiskThreads/WinDiskThreadsDiskFile.h	29 Aug 2006 20:13:50 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: WinDiskThreadsDiskFile.h,v 1.1.2.1 2005/01/01 18:54:31 serassio Exp $
+ * $Id: WinDiskThreadsDiskFile.h,v 1.1.2.2 2006/08/29 20:13:50 serassio Exp $
  *
  * DEBUG: section 79    Disk IO Routines
  * AUTHOR: Robert Collins
@@ -36,6 +36,7 @@
 
 #ifndef SQUID_DISKTHREADSDISKFILE_H
 #define SQUID_DISKTHREADSDISKFILE_H
+#include "cbdata.h"
 #include "DiskIO/DiskFile.h"
 #include "WinDiskThreads.h"
 
Index: squid3/src/DiskIO/WinDiskThreads/aiops.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/DiskIO/WinDiskThreads/Attic/aiops.cc,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- squid3/src/DiskIO/WinDiskThreads/aiops.cc	17 Jun 2006 16:51:48 -0000	1.1.2.7
+++ squid3/src/DiskIO/WinDiskThreads/aiops.cc	29 Aug 2006 20:13:50 -0000	1.1.2.8
@@ -1,5 +1,5 @@
 /*
- * $Id: aiops.cc,v 1.1.2.7 2006/06/17 16:51:48 serassio Exp $
+ * $Id: aiops.cc,v 1.1.2.8 2006/08/29 20:13:50 serassio Exp $
  *
  * DEBUG: section 43    AIOPS
  * AUTHOR: Stewart Forster <slf@connect.com.au>
@@ -45,6 +45,7 @@
 #include	<signal.h>
 #include "CommIO.h"
 #include "SquidTime.h"
+#include "Store.h"
 
 #define RIDICULOUS_LENGTH	4096