From 4833c6555e95f30ab160ee6eb22d120b3f884863 Mon Sep 17 00:00:00 2001 From: fros4943 Date: Tue, 23 Mar 2010 13:35:00 +0000 Subject: [PATCH] moved inclusion of rtimer-arch.h to top of rtimer.h, to avoid circular rtimer_clock_t dependencies --- core/sys/rtimer.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/sys/rtimer.h b/core/sys/rtimer.h index 039a5b79a..db4539e36 100644 --- a/core/sys/rtimer.h +++ b/core/sys/rtimer.h @@ -48,11 +48,13 @@ * * This file is part of the Contiki operating system. * - * @(#)$Id: rtimer.h,v 1.10 2010/03/23 13:24:38 fros4943 Exp $ + * @(#)$Id: rtimer.h,v 1.11 2010/03/23 13:35:00 fros4943 Exp $ */ #ifndef __RTIMER_H__ #define __RTIMER_H__ +#include "rtimer-arch.h" + #ifndef RTIMER_CLOCK_LT typedef unsigned short rtimer_clock_t; #define RTIMER_CLOCK_LT(a,b) ((signed short)((a)-(b)) < 0) @@ -147,8 +149,6 @@ void rtimer_arch_schedule(rtimer_clock_t t); #define RTIMER_SECOND RTIMER_ARCH_SECOND -#include "rtimer-arch.h" - #endif /* __RTIMER_H__ */ /** @} */