From 095f700b6322e6fb715b07eed928e36909ebaf75 Mon Sep 17 00:00:00 2001 From: nifi Date: Mon, 13 Sep 2010 20:46:02 +0000 Subject: [PATCH] Moved down inclusion of rtimer-arch.h to allow rtimer_clock_t to be used in rtimer-arch.h --- core/sys/rtimer.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/sys/rtimer.h b/core/sys/rtimer.h index db4539e36..db7c053ea 100644 --- a/core/sys/rtimer.h +++ b/core/sys/rtimer.h @@ -48,18 +48,20 @@ * * This file is part of the Contiki operating system. * - * @(#)$Id: rtimer.h,v 1.11 2010/03/23 13:35:00 fros4943 Exp $ + * @(#)$Id: rtimer.h,v 1.12 2010/09/13 20:46:02 nifi Exp $ */ #ifndef __RTIMER_H__ #define __RTIMER_H__ -#include "rtimer-arch.h" +#include "contiki-conf.h" #ifndef RTIMER_CLOCK_LT typedef unsigned short rtimer_clock_t; #define RTIMER_CLOCK_LT(a,b) ((signed short)((a)-(b)) < 0) #endif /* RTIMER_CLOCK_LT */ +#include "rtimer-arch.h" + /** * \brief Initialize the real-time scheduler. *