---------------------
PatchSet 1165
Date: 2005/01/05 22:08:04
Author: serassio
Branch: nt
Tag: (none)
Log:
Post merge Windows fixes
Members:
port/win32/squid/squid.vcproj:1.1.2.3->1.1.2.4
src/DiskIO/WinDiskThreads/WinDiskThreadsDiskFile.cc:1.1.2.1->1.1.2.2
Index: squid3/port/win32/squid/squid.vcproj
===================================================================
RCS file: /cvsroot/squid-sf//squid3/port/win32/squid/Attic/squid.vcproj,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- squid3/port/win32/squid/squid.vcproj 1 Jan 2005 19:04:47 -0000 1.1.2.3
+++ squid3/port/win32/squid/squid.vcproj 5 Jan 2005 22:11:54 -0000 1.1.2.4
@@ -502,6 +502,10 @@
>
+
+
@@ -1064,6 +1068,10 @@
+
+
Index: squid3/src/DiskIO/WinDiskThreads/WinDiskThreadsDiskFile.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/DiskIO/WinDiskThreads/Attic/WinDiskThreadsDiskFile.cc,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.cc 1 Jan 2005 18:54:31 -0000 1.1.2.1
+++ squid3/src/DiskIO/WinDiskThreads/WinDiskThreadsDiskFile.cc 5 Jan 2005 22:08:04 -0000 1.1.2.2
@@ -1,6 +1,6 @@
/*
- * $Id: WinDiskThreadsDiskFile.cc,v 1.1.2.1 2005/01/01 18:54:31 serassio Exp $
+ * $Id: WinDiskThreadsDiskFile.cc,v 1.1.2.2 2005/01/05 22:08:04 serassio Exp $
*
* DEBUG: section 79 Disk IO Routines
* AUTHOR: Robert Collins
@@ -38,7 +38,6 @@
#include "squid.h"
#include "WinDiskThreadsDiskFile.h"
#include "Store.h"
-#include "SwapDir.h"
#include "Generic.h"
#include "DiskIO/IORequestor.h"
#include "DiskIO/ReadRequest.h"