Module: xenomai-forge Branch: master Commit: e3fa01aa3af6b51b8657b9fe866a0d0649ca1fb5 URL: http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=e3fa01aa3af6b51b8657b9fe866a0d0649ca1fb5
Author: Philippe Gerum <[email protected]> Date: Mon Dec 5 09:24:15 2011 +0100 copperplate/clockobj: fix mercury build w/ disabled lores clocks --- lib/copperplate/clockobj.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/lib/copperplate/clockobj.c b/lib/copperplate/clockobj.c index 03d851a..52ecb6c 100644 --- a/lib/copperplate/clockobj.c +++ b/lib/copperplate/clockobj.c @@ -328,11 +328,15 @@ void clockobj_get_date(struct clockobj *clkobj, ticks_t *pticks) #else /* CONFIG_XENO_MERCURY */ +#ifndef CONFIG_XENO_LORES_CLOCK_DISABLED + sticks_t clockobj_ns_to_ticks(struct clockobj *clkobj, sticks_t ns) { return ns / clkobj->resolution; } +#endif /* !CONFIG_XENO_LORES_CLOCK_DISABLED */ + void clockobj_get_time(struct clockobj *clkobj, ticks_t *pticks, ticks_t *ptsc) { _______________________________________________ Xenomai-git mailing list [email protected] https://mail.gna.org/listinfo/xenomai-git
