diff options
| author | Martin Ebourne <martin@ebourne.me.uk> | 2005-12-12 20:50:00 +0000 |
|---|---|---|
| committer | Martin Ebourne <martin@ebourne.me.uk> | 2005-12-12 20:50:00 +0000 |
| commit | 3bedf8846f4d7a5cb38276b274662d62a36dcd52 (patch) | |
| tree | 9d51de8b0f3d06ba6549a5a1958e52f592343140 /lib/common/BoxTime.h | |
| parent | 81d8eda2419e7a23088a98cdfc52a305c9ceac0d (diff) | |
Marged chris/win32/merge/07-win32-fixes at r210 to trunk
Diffstat (limited to 'lib/common/BoxTime.h')
| -rwxr-xr-x | lib/common/BoxTime.h | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |