Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki

This commit is contained in:
Nicolas Tsiftes 2012-01-10 11:38:57 +01:00
commit 510f20dc42
70 changed files with 6337 additions and 256 deletions

View file

@ -422,7 +422,7 @@ handle_incoming_data(void)
PRINTF("uip_datalen received %u \n",(u16_t)uip_datalen());
char* data = uip_appdata + uip_ext_len;
char* data = (char *)uip_appdata + uip_ext_len;
u16_t datalen = uip_datalen() - uip_ext_len;
int data_size = 0;