Module: xenomai-3 Branch: next Commit: 64fbf7e85c1c67d6ec7791869fb81daf5ebaaef6 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=64fbf7e85c1c67d6ec7791869fb81daf5ebaaef6
Author: Philippe Gerum <r...@xenomai.org> Date: Wed Jun 17 10:30:21 2015 +0200 copperplate/clockobj: use proper type for clock ticks --- lib/copperplate/clockobj.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/copperplate/clockobj.c b/lib/copperplate/clockobj.c index 21a420d..43928d7 100644 --- a/lib/copperplate/clockobj.c +++ b/lib/copperplate/clockobj.c @@ -263,13 +263,13 @@ sticks_t clockobj_ns_to_ticks(struct clockobj *clkobj, sticks_t ns) void clockobj_get_date(struct clockobj *clkobj, ticks_t *pticks) { - unsigned long long ns; + ticks_t ns; read_lock_nocancel(&clkobj->lock); ns = cobalt_ticks_to_ns(clockobj_get_tsc()); /* Add offset to epoch. */ - ns += (unsigned long long)clkobj->offset.tv_sec * 1000000000ULL; + ns += (ticks_t)clkobj->offset.tv_sec * 1000000000ULL; ns += clkobj->offset.tv_nsec; if (clockobj_get_resolution(clkobj) > 1) ns /= clockobj_get_resolution(clkobj); _______________________________________________ Xenomai-git mailing list Xenomai-git@xenomai.org http://xenomai.org/mailman/listinfo/xenomai-git