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:
parent
5a46c629de
commit
5585d72c86
115 changed files with 675 additions and 675 deletions
|
@ -29,7 +29,7 @@
|
|||
*
|
||||
* This file is part of the Contiki desktop environment
|
||||
*
|
||||
* $Id: simpletelnet.c,v 1.6 2010/05/31 15:22:08 nifi Exp $
|
||||
* $Id: simpletelnet.c,v 1.7 2010/10/19 18:29:03 adamdunkels Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
|
@ -185,7 +185,7 @@ connect(void)
|
|||
}
|
||||
|
||||
|
||||
conn = tcp_connect(addrptr, htons(port), &ts_appstate);
|
||||
conn = tcp_connect(addrptr, uip_htons(port), &ts_appstate);
|
||||
if(conn == NULL) {
|
||||
show("Out of memory error");
|
||||
return;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue