--------------------- PatchSet 3316 Date: 2006/06/17 22:03:25 Author: serassio Branch: nt Tag: (none) Log: Fixed Visual Studio build error Members: lib/MemPool.cc:1.1.2.2->1.1.2.3 src/peer_digest.cc:1.4.2.19->1.4.2.20 Index: squid3/lib/MemPool.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/lib/MemPool.cc,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- squid3/lib/MemPool.cc 26 Dec 2004 09:56:33 -0000 1.1.2.2 +++ squid3/lib/MemPool.cc 17 Jun 2006 22:03:25 -0000 1.1.2.3 @@ -1,6 +1,6 @@ /* - * $Id: MemPool.cc,v 1.1.2.2 2004/12/26 09:56:33 serassio Exp $ + * $Id: MemPool.cc,v 1.1.2.3 2006/06/17 22:03:25 serassio Exp $ * * DEBUG: section 63 Low Level Memory Pool Management * AUTHOR: Alex Rousskov, Andres Kroonmaa, Robert Collins @@ -97,7 +97,7 @@ * XXX This is a boundary violation between lib and src.. would be good * if it could be solved otherwise, but left for now. */ -extern "C" time_t squid_curtime; +extern time_t squid_curtime; /* local data */ static MemPoolMeter TheMeter; Index: squid3/src/peer_digest.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/peer_digest.cc,v retrieving revision 1.4.2.19 retrieving revision 1.4.2.20 diff -u -r1.4.2.19 -r1.4.2.20 --- squid3/src/peer_digest.cc 21 May 2006 06:19:52 -0000 1.4.2.19 +++ squid3/src/peer_digest.cc 17 Jun 2006 22:05:09 -0000 1.4.2.20 @@ -1,6 +1,6 @@ /* - * $Id: peer_digest.cc,v 1.4.2.19 2006/05/21 06:19:52 serassio Exp $ + * $Id: peer_digest.cc,v 1.4.2.20 2006/06/17 22:05:09 serassio Exp $ * * DEBUG: section 72 Peer Digest Routines * AUTHOR: Alex Rousskov @@ -1072,7 +1072,7 @@ static int saneDiff(time_t diff) { - return abs(diff) > squid_curtime / 2 ? 0 : diff; + return abs((int) diff) > squid_curtime / 2 ? 0 : diff; } void