deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move MAX, MIN and ABS to sys/cc.h

Browse source
This commit is contained in:
Moritz 'Morty' Strübe 2014-12-01 13:58:34 +01:00
parent c9324d133f
commit 0dab6926b3
33 changed files with 41 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/net/mac/cxmac/cxmac.c
View file

@ -52,6 +52,7 @@
#include "sys/rtimer.h"
#include "contiki-conf.h"
#include "sys/cc.h"
#ifdef EXPERIMENT_SETUP
#include "experiment-setup.h"
@ -215,10 +216,6 @@ static linkaddr_t is_streaming_to, is_streaming_to_too;
static rtimer_clock_t stream_until;
#define DEFAULT_STREAM_TIME (RTIMER_ARCH_SECOND)
#ifndef MIN
#define MIN(a, b) ((a) < (b)? (a) : (b))
#endif /* MIN */
/*---------------------------------------------------------------------------*/
static void
on(void)