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 @@
*
* This file is part of the uIP TCP/IP stack.
*
* $Id: telnet.c,v 1.2 2009/03/05 23:56:56 adamdunkels Exp $
* $Id: telnet.c,v 1.3 2010/10/19 18:29:03 adamdunkels Exp $
*
*/
@ -108,7 +108,7 @@ telnet_connect(struct telnet_state *s, uip_ipaddr_t *addr, u16_t port)
{
struct uip_conn *conn;
conn = tcp_connect(addr, htons(port), s);
conn = tcp_connect(addr, uip_htons(port), s);
if(conn == NULL) {
return NULL;
}