summaryrefslogtreecommitdiff
path: root/tools.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2006-12-02 11:30:19 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2006-12-02 11:30:19 +0100
commit19f39258f0b3131345c1b0b3aa1a5c03f88bc33a (patch)
treee031524a37d3ea229d11b33766e4233567f16412 /tools.c
parent661da094e14b6ab76eae98a5eeb2c3ac6c914df4 (diff)
downloadvdr-19f39258f0b3131345c1b0b3aa1a5c03f88bc33a.tar.gz
vdr-19f39258f0b3131345c1b0b3aa1a5c03f88bc33a.tar.bz2
Replaced 'unsigned long long' with 'uint32_t' and 'uint64' with 'uint64_t' to avoid problems on 64-bit machines
Diffstat (limited to 'tools.c')
-rw-r--r--tools.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools.c b/tools.c
index 8ec1e696..255c8061 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: tools.c 1.120 2006/08/12 13:30:07 kls Exp $
+ * $Id: tools.c 1.121 2006/12/02 11:12:59 kls Exp $
*/
#include "tools.h"
@@ -547,11 +547,11 @@ cTimeMs::cTimeMs(void)
Set();
}
-uint64 cTimeMs::Now(void)
+uint64_t cTimeMs::Now(void)
{
struct timeval t;
if (gettimeofday(&t, NULL) == 0)
- return (uint64(t.tv_sec)) * 1000 + t.tv_usec / 1000;
+ return (uint64_t(t.tv_sec)) * 1000 + t.tv_usec / 1000;
return 0;
}
@@ -565,7 +565,7 @@ bool cTimeMs::TimedOut(void)
return Now() >= begin;
}
-uint64 cTimeMs::Elapsed(void)
+uint64_t cTimeMs::Elapsed(void)
{
return Now() - begin;
}