diff --git a/core/lib/settings.h b/core/lib/settings.h index d2ac05e1d..c35a88743 100644 --- a/core/lib/settings.h +++ b/core/lib/settings.h @@ -108,6 +108,7 @@ #include #include #include "dev/eeprom.h" +#include "sys/cc.h" /*****************************************************************************/ // MARK: - Types diff --git a/platform/avr-atmega128rfa1/contiki-conf.h b/platform/avr-atmega128rfa1/contiki-conf.h index 045f78e5f..d08d0590b 100644 --- a/platform/avr-atmega128rfa1/contiki-conf.h +++ b/platform/avr-atmega128rfa1/contiki-conf.h @@ -341,6 +341,9 @@ typedef unsigned short uip_stats_t; #define CCIF #define CLIF +#ifndef CC_CONF_INLINE +#define CC_CONF_INLINE inline +#endif /* include the project config */ /* PROJECT_CONF_H might be defined in the project Makefile */ diff --git a/platform/avr-raven/contiki-conf.h b/platform/avr-raven/contiki-conf.h index 0c84c9266..395280877 100644 --- a/platform/avr-raven/contiki-conf.h +++ b/platform/avr-raven/contiki-conf.h @@ -356,6 +356,9 @@ typedef unsigned short uip_stats_t; #define CCIF #define CLIF +#ifndef CC_CONF_INLINE +#define CC_CONF_INLINE inline +#endif /* include the project config */ /* PROJECT_CONF_H might be defined in the project Makefile */ diff --git a/platform/avr-zigbit/contiki-conf.h b/platform/avr-zigbit/contiki-conf.h index d48f85419..32d3e1d5b 100644 --- a/platform/avr-zigbit/contiki-conf.h +++ b/platform/avr-zigbit/contiki-conf.h @@ -91,6 +91,9 @@ void clock_adjust_ticks(clock_time_t howmany); #define CCIF #define CLIF +#ifndef CC_CONF_INLINE +#define CC_CONF_INLINE inline +#endif #define RIMEADDR_CONF_SIZE 8 #define PACKETBUF_CONF_HDR_SIZE 0