From: serassio <> Date: Sun, 18 Jun 2006 14:56:32 +0000 (+0000) Subject: Fixed Visual Studio build errors X-Git-Tag: SQUID_3_0_PRE4~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3db6fb5489e17aa534e89c3ec810c6ae0b12f875;p=thirdparty%2Fsquid.git Fixed Visual Studio build errors --- diff --git a/lib/MemPool.cc b/lib/MemPool.cc index f272f53e7d..79f8df6e13 100644 --- a/lib/MemPool.cc +++ b/lib/MemPool.cc @@ -1,6 +1,6 @@ /* - * $Id: MemPool.cc,v 1.2 2005/08/21 18:33:24 serassio Exp $ + * $Id: MemPool.cc,v 1.3 2006/06/18 08:56:32 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; diff --git a/src/peer_digest.cc b/src/peer_digest.cc index f0ff2e2db9..54768d8491 100644 --- a/src/peer_digest.cc +++ b/src/peer_digest.cc @@ -1,6 +1,6 @@ /* - * $Id: peer_digest.cc,v 1.115 2006/05/19 17:19:10 wessels Exp $ + * $Id: peer_digest.cc,v 1.116 2006/06/18 08:56:33 serassio Exp $ * * DEBUG: section 72 Peer Digest Routines * AUTHOR: Alex Rousskov @@ -1072,7 +1072,7 @@ peerDigestUseful(const PeerDigest * pd) static int saneDiff(time_t diff) { - return abs(diff) > squid_curtime / 2 ? 0 : diff; + return abs((int) diff) > squid_curtime / 2 ? 0 : diff; } void