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

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

View file

@ -28,7 +28,7 @@ c/*
*
* This file is part of the Contiki operating system.
*
* $Id: rawpacket-udp.c,v 1.3 2007/11/17 18:05:21 adamdunkels Exp $
* $Id: rawpacket-udp.c,v 1.4 2010/10/19 18:29:04 adamdunkels Exp $
*/
/**
@ -55,7 +55,7 @@ rawpacket_udp_init(void)
struct rawpacket_conn *
rawpacket_setup(int id)
{
return (struct rawpacket_conn *)udp_broadcast_new(HTONS(PORT + id), NULL);
return (struct rawpacket_conn *)udp_broadcast_new(UIP_HTONS(PORT + id), NULL);
}
/*---------------------------------------------------------------------------*/
void