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

@ -44,7 +44,7 @@
*
* This file is part of the Mycal Modified uIP TCP/IP stack.
*
* $Id: lcp.c,v 1.1 2007/05/26 07:14:39 oliverschmidt Exp $
* $Id: lcp.c,v 1.2 2010/10/19 18:29:03 adamdunkels Exp $
*
*/
@ -438,7 +438,7 @@ lcp_task(u8_t *buffer)
#endif
/* Write length */
t = bptr - buffer;
pkt->len = htons(t); /* length here - code and ID + */
pkt->len = uip_htons(t); /* length here - code and ID + */
DEBUG1((" len %d\n",t));