Merge pull request contiki-os#292 from darconeous/pull-requests/setti…

…ngs-cc-inline-fix settings: Correct a problem where sometimes CC_INLINE is not defined properly
cskiraly · Jul 2, 2013 · 10f64c0 · 10f64c0
2 parents ad34b71 + 0308d3f
commit 10f64c0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/core/lib/settings.h b/core/lib/settings.h
@@ -108,6 +108,7 @@
 #include <stdint.h>
 #include <string.h>
 #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
@@ -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
@@ -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
@@ -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