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

Merge pull request #342 from zwuh/patch-trickle-lib

Browse source 
Typo and file mode fix for Trickle library, typo fix in uipopt.h
This commit is contained in:
George Oikonomou 2013-09-13 02:46:26 -07:00
parent 4772455a9a e75dacb5fa
commit d646f3daf5
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
core/lib/trickle-timer.c Executable file → Normal file
View file

2
core/lib/trickle-timer.h Executable file → Normal file
View file

@ -437,7 +437,7 @@ uint8_t trickle_timer_set(struct trickle_timer *tt,
* to reset a timer manually. Instead, in response to events or inconsistencies, * to reset a timer manually. Instead, in response to events or inconsistencies,
* the corresponding functions must be used * the corresponding functions must be used
*/ */
#define trickle_timer_stop(tt) ctimer_stop((tt)->ct) #define trickle_timer_stop(tt) ctimer_stop(&((tt)->ct))
/** /**
* \brief To be called by the protocol when it hears a consistent * \brief To be called by the protocol when it hears a consistent

6
core/net/uipopt.h
View file

@ -281,15 +281,15 @@
*/ */
/** /**
* Toggles whether UDP support should be compiled in or not. * Toggles whether TCP support should be compiled in or not.
* *
* \hideinitializer * \hideinitializer
*/ */
#ifdef UIP_CONF_TCP #ifdef UIP_CONF_TCP
#define UIP_TCP (UIP_CONF_TCP) #define UIP_TCP (UIP_CONF_TCP)
#else /* UIP_CONF_UDP */ #else /* UIP_CONF_TCP */
#define UIP_TCP 1 #define UIP_TCP 1
#endif /* UIP_CONF_UDP */ #endif /* UIP_CONF_TCP */
/** /**
* Determines if support for opening connections from uIP should be * Determines if support for opening connections from uIP should be