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

ctk-curses: fix build

Browse source 
Including curses.h in contiki-conf.h (required for COLOR_* defines)
induced a symbol name clash with neighbor-attr.c on "timeout".

Renamed timeout to neighbor_timeout.
This commit is contained in:
François Revol 2013-03-20 01:24:18 +01:00
parent 1c5d6a9db7
commit 9ffaa96475
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/net/neighbor-attr.c
View file

@ -48,7 +48,7 @@
#define PRINTF(...) #define PRINTF(...)
#endif #endif
static uint16_t timeout = 0; static uint16_t neighbor_timeout = 0;
MEMB(neighbor_addr_mem, struct neighbor_addr, NEIGHBOR_ATTR_MAX_NEIGHBORS); MEMB(neighbor_addr_mem, struct neighbor_addr, NEIGHBOR_ATTR_MAX_NEIGHBORS);
@ -209,7 +209,7 @@ neighbor_attr_tick(const rimeaddr_t * addr)
uint16_t uint16_t
neighbor_attr_get_timeout(void) neighbor_attr_get_timeout(void)
{ {
return timeout; return neighbor_timeout;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static struct ctimer ct; static struct ctimer ct;
@ -218,12 +218,12 @@ static struct ctimer ct;
static void static void
timeout_check(void *ptr) timeout_check(void *ptr)
{ {
if(timeout > 0) { if(neighbor_timeout > 0) {
struct neighbor_addr *item = neighbor_attr_list_neighbors(); struct neighbor_addr *item = neighbor_attr_list_neighbors();
while(item != NULL) { while(item != NULL) {
item->time += TIMEOUT_SECONDS; item->time += TIMEOUT_SECONDS;
if(item->time >= timeout) { if(item->time >= neighbor_timeout) {
struct neighbor_addr *next_item = item->next; struct neighbor_addr *next_item = item->next;
list_remove(neighbor_addrs, item); list_remove(neighbor_addrs, item);
@ -240,11 +240,11 @@ timeout_check(void *ptr)
void void
neighbor_attr_set_timeout(uint16_t time) neighbor_attr_set_timeout(uint16_t time)
{ {
if(timeout == 0 && time > 0) { if(neighbor_timeout == 0 && time > 0) {
ctimer_set(&ct, TIMEOUT_SECONDS * CLOCK_SECOND, timeout_check, NULL); ctimer_set(&ct, TIMEOUT_SECONDS * CLOCK_SECOND, timeout_check, NULL);
} else if(timeout > 0 && time == 0) { } else if(neighbor_timeout > 0 && time == 0) {
ctimer_stop(&ct); ctimer_stop(&ct);
} }
timeout = time; neighbor_timeout = time;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/