From b5815e85097e7692181f8bd59d65584d3e6bd3c7 Mon Sep 17 00:00:00 2001 From: Zhen-Huan Hwang Date: Wed, 11 Sep 2013 18:30:31 +0300 Subject: [PATCH 1/2] Fixed a typo in net/uipopt.h --- core/net/uipopt.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/net/uipopt.h b/core/net/uipopt.h index bf3097a0a..7c9939003 100644 --- a/core/net/uipopt.h +++ b/core/net/uipopt.h @@ -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 */ #ifdef UIP_CONF_TCP #define UIP_TCP (UIP_CONF_TCP) -#else /* UIP_CONF_UDP */ +#else /* UIP_CONF_TCP */ #define UIP_TCP 1 -#endif /* UIP_CONF_UDP */ +#endif /* UIP_CONF_TCP */ /** * Determines if support for opening connections from uIP should be From e75dacb5faf6e12b675df26ecd683074ea127d12 Mon Sep 17 00:00:00 2001 From: Zhen-Huan Hwang Date: Wed, 11 Sep 2013 18:31:06 +0300 Subject: [PATCH 2/2] 1. Added a missing '&' in lib/trickle-timer.h 2. Removed executable permissions of lib/trickle-timer.c & .h --- core/lib/trickle-timer.c | 0 core/lib/trickle-timer.h | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 core/lib/trickle-timer.c mode change 100755 => 100644 core/lib/trickle-timer.h diff --git a/core/lib/trickle-timer.c b/core/lib/trickle-timer.c old mode 100755 new mode 100644 diff --git a/core/lib/trickle-timer.h b/core/lib/trickle-timer.h old mode 100755 new mode 100644 index c7c004748..d32a3358e --- a/core/lib/trickle-timer.h +++ b/core/lib/trickle-timer.h @@ -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, * 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