From 0fc5ec8d5c288c94e2d898e10c037461a2c76e68 Mon Sep 17 00:00:00 2001 From: George Oikonomou Date: Mon, 30 Apr 2012 14:02:35 +0100 Subject: [PATCH] Fixed an SDCC compile error when UIP_CONF_ROUTER is 0. UIP_CONF_ROUTER can be configured in project-conf.h --- platform/cc2530dk/contiki-conf.h | 10 +++++++++- platform/sensinode/contiki-conf.h | 8 ++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/platform/cc2530dk/contiki-conf.h b/platform/cc2530dk/contiki-conf.h index c344b943a..25eac38bf 100644 --- a/platform/cc2530dk/contiki-conf.h +++ b/platform/cc2530dk/contiki-conf.h @@ -182,7 +182,15 @@ #define UIP_CONF_UDP_CHECKSUMS 1 /* ND and Routing */ -#define UIP_CONF_ROUTER 1 +#ifndef UIP_CONF_ROUTER +#define UIP_CONF_ROUTER 1 +#endif + +/* Prevent SDCC compile error when UIP_CONF_ROUTER == 0 */ +#if !UIP_CONF_ROUTER +#define UIP_CONF_DS6_AADDR_NBU 1 +#endif + #define UIP_CONF_ND6_SEND_RA 0 #define UIP_CONF_IP_FORWARD 0 #define RPL_CONF_STATS 0 diff --git a/platform/sensinode/contiki-conf.h b/platform/sensinode/contiki-conf.h index b006535d2..ea11008d8 100644 --- a/platform/sensinode/contiki-conf.h +++ b/platform/sensinode/contiki-conf.h @@ -201,7 +201,15 @@ #define UIP_CONF_UDP_CHECKSUMS 1 /* ND and Routing */ +#ifndef UIP_CONF_ROUTER #define UIP_CONF_ROUTER 1 +#endif + +/* Prevent SDCC compile error when UIP_CONF_ROUTER == 0 */ +#if !UIP_CONF_ROUTER +#define UIP_CONF_DS6_AADDR_NBU 1 +#endif + #define UIP_CONF_ND6_SEND_RA 0 #define UIP_CONF_IP_FORWARD 0 #define RPL_CONF_STATS 0