Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-12-23 01:29:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #292 from darconeous/pull-requests/settings-cc-inline-fix

Browse Source 
settings: Correct a problem where sometimes CC_INLINE is not defined properly
This commit is contained in:
Robert Quattlebaum 2013-07-02 09:17:22 -07:00
commit 10f64c0ce8
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/lib/settings.h
View File

@ -108,6 +108,7 @@
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include "dev/eeprom.h" #include "dev/eeprom.h"
#include "sys/cc.h"
/*****************************************************************************/ /*****************************************************************************/
// MARK: - Types // MARK: - Types

3
platform/avr-atmega128rfa1/contiki-conf.h
View File

@ -341,6 +341,9 @@ typedef unsigned short uip_stats_t;
#define CCIF #define CCIF
#define CLIF #define CLIF
#ifndef CC_CONF_INLINE
#define CC_CONF_INLINE inline
#endif
/* include the project config */ /* include the project config */
/* PROJECT_CONF_H might be defined in the project Makefile */ /* PROJECT_CONF_H might be defined in the project Makefile */

3
platform/avr-raven/contiki-conf.h
View File

@ -356,6 +356,9 @@ typedef unsigned short uip_stats_t;
#define CCIF #define CCIF
#define CLIF #define CLIF
#ifndef CC_CONF_INLINE
#define CC_CONF_INLINE inline
#endif
/* include the project config */ /* include the project config */
/* PROJECT_CONF_H might be defined in the project Makefile */ /* PROJECT_CONF_H might be defined in the project Makefile */

3
platform/avr-zigbit/contiki-conf.h
View File

@ -91,6 +91,9 @@ void clock_adjust_ticks(clock_time_t howmany);
#define CCIF #define CCIF
#define CLIF #define CLIF
#ifndef CC_CONF_INLINE
#define CC_CONF_INLINE inline
#endif
#define RIMEADDR_CONF_SIZE 8 #define RIMEADDR_CONF_SIZE 8
#define PACKETBUF_CONF_HDR_SIZE 0 #define PACKETBUF_CONF_HDR_SIZE 0