From 3bedf8846f4d7a5cb38276b274662d62a36dcd52 Mon Sep 17 00:00:00 2001 From: Martin Ebourne Date: Mon, 12 Dec 2005 20:50:00 +0000 Subject: Marged chris/win32/merge/07-win32-fixes at r210 to trunk --- lib/common/BoxTime.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/common/BoxTime.h') diff --git a/lib/common/BoxTime.h b/lib/common/BoxTime.h index a7a25ac6..d166d6e7 100755 --- a/lib/common/BoxTime.h +++ b/lib/common/BoxTime.h @@ -31,11 +31,11 @@ inline box_time_t SecondsToBoxTime(uint64_t Seconds) { return ((box_time_t)Seconds * MICRO_SEC_IN_SEC_LL); } -inline int64_t BoxTimeToSeconds(box_time_t Time) +inline box_time_t BoxTimeToSeconds(box_time_t Time) { return Time / MICRO_SEC_IN_SEC_LL; } -inline int64_t BoxTimeToMilliSeconds(box_time_t Time) +inline box_time_t BoxTimeToMilliSeconds(box_time_t Time) { return Time / MILLI_SEC_IN_NANO_SEC_LL; } -- cgit v1.2.3