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

@ -41,7 +41,7 @@
*
* This file is part of the "ctk" console GUI toolkit for cc65
*
* $Id: ctk-vncserver-service.c,v 1.1 2007/05/23 23:19:13 oliverschmidt Exp $
* $Id: ctk-vncserver-service.c,v 1.2 2010/10/19 18:29:03 adamdunkels Exp $
*
*/
@ -1123,7 +1123,7 @@ EK_EVENTHANDLER(eventhandler, ev, data)
switch(ev) {
case EK_EVENT_INIT:
case EK_EVENT_REPLACE:
tcp_listen(HTONS(5900));
tcp_listen(UIP_HTONS(5900));
for(i = 0; i < CTK_VNCSERVER_CONF_NUMCONNS; ++i) {
conns[i].state = VNC_DEALLOCATED;