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

Merge pull request #883 from cmorty/pull/global-macros

Browse source 
Move MAX, MIN and ABS to contiki-macros
This commit is contained in:
Adam Dunkels 2015-05-18 21:33:00 +02:00
commit 730bda2001
33 changed files with 41 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

5
examples/cc26xx/cc26xx-web-demo/net-uart.c
View file

@ -65,6 +65,7 @@
#include "net/ip/uiplib.h"
#include "net-uart.h"
#include "httpd-simple.h"
#include "sys/cc.h"
#include "ti-lib.h"
@ -86,10 +87,6 @@
#define ADDRESS_CONVERSION_OK 1
#define ADDRESS_CONVERSION_ERROR 0
/*---------------------------------------------------------------------------*/
#ifndef MIN
#define MIN(n, m) (((n) < (m)) ? (n) : (m))
#endif
/*---------------------------------------------------------------------------*/
static struct uip_udp_conn *udp_conn = NULL;
static uint8_t buffer[MAX_MSG_SIZE];