Moved down inclusion of rtimer-arch.h to allow rtimer_clock_t to be used in rtimer-arch.h

This commit is contained in:
nifi 2010-09-13 20:46:02 +00:00
parent 6794154aa5
commit 095f700b63

View File

@ -48,18 +48,20 @@
* *
* This file is part of the Contiki operating system. * 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__ #ifndef __RTIMER_H__
#define __RTIMER_H__ #define __RTIMER_H__
#include "rtimer-arch.h" #include "contiki-conf.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)
#endif /* RTIMER_CLOCK_LT */ #endif /* RTIMER_CLOCK_LT */
#include "rtimer-arch.h"
/** /**
* \brief Initialize the real-time scheduler. * \brief Initialize the real-time scheduler.
* *