moved inclusion of rtimer-arch.h to top of rtimer.h, to avoid circular rtimer_clock_t dependencies

This commit is contained in:
fros4943 2010-03-23 13:35:00 +00:00
parent 1322195921
commit 4833c6555e

View File

@ -48,11 +48,13 @@
* *
* This file is part of the Contiki operating system. * 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__ #ifndef __RTIMER_H__
#define __RTIMER_H__ #define __RTIMER_H__
#include "rtimer-arch.h"
#ifndef RTIMER_CLOCK_LT #ifndef RTIMER_CLOCK_LT
typedef unsigned short rtimer_clock_t; typedef unsigned short rtimer_clock_t;
#define RTIMER_CLOCK_LT(a,b) ((signed short)((a)-(b)) < 0) #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 #define RTIMER_SECOND RTIMER_ARCH_SECOND
#include "rtimer-arch.h"
#endif /* __RTIMER_H__ */ #endif /* __RTIMER_H__ */
/** @} */ /** @} */