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

A simple but substantial change: uIP used the htons()/HTONS() macro

Browse source 
functions for converting between host and network byte order. These
names are the de facto standard names for this functionality because
of the original BSD TCP/IP implementation. But they cause problems for
uIP/Contiki: some platforms define these names themselves (Mac OS,
most notably), causing compilation problems for Contiki on those
platforms.

This commit changes all htons to uip_htons instead. Same goes for
htonl, ntohs, and ntohl. All-caps versions as well.
This commit is contained in:
adamdunkels 2010-10-19 18:29:03 +00:00
parent 5a46c629de
commit 5585d72c86
115 changed files with 675 additions and 675 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apps/webserver/httpd.c
View file

@ -30,7 +30,7 @@
*
* Author: Adam Dunkels <adam@sics.se>
*
* $Id: httpd.c,v 1.18 2010/04/11 20:54:39 oliverschmidt Exp $
* $Id: httpd.c,v 1.19 2010/10/19 18:29:03 adamdunkels Exp $
*/
#include <stdio.h>
@ -336,7 +336,7 @@ httpd_appcall(void *state)
void
httpd_init(void)
{
tcp_listen(HTONS(80));
tcp_listen(UIP_HTONS(80));
memb_init(&conns);
httpd_cgi_init();
}
@ -362,7 +362,7 @@ httpd_sprint_ip6(uip_ip6addr_t addr, char * result)
i += zerocnt;
numprinted += zerocnt;
} else {
result += sprintf(result, "%x", (unsigned int)(ntohs(addr.u16[i])));
result += sprintf(result, "%x", (unsigned int)(uip_ntohs(addr.u16[i])));
i++;
numprinted++;
}