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.

platform/pc-6001/apps/webserver-mini/httpd-cgi.c

@@ -28,7 +28,7 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: httpd-cgi.c,v 1.1 2007/11/28 09:40:13 matsutsuka Exp $
+ * $Id: httpd-cgi.c,v 1.2 2010/10/19 18:29:05 adamdunkels Exp $
  *
  */
 
@@ -164,12 +164,12 @@ make_tcp_stats(void *arg)
   conn = &uip_conns[s->u.count];
   return sprintf((char *)uip_appdata,
 		 "<tr align=\"center\"><td>%d</td><td>%u.%u.%u.%u:%u</td><td>%s</td><td>%u</td><td>%u</td><td>%c %c</td></tr>\r\n",
-		 htons(conn->lport),
+		 uip_htons(conn->lport),
 		 conn->ripaddr.u8[0],
 		 conn->ripaddr.u8[1],
 		 conn->ripaddr.u8[2],
 		 conn->ripaddr.u8[3],
-		 htons(conn->rport),
+		 uip_htons(conn->rport),
 		 states[conn->tcpstateflags & UIP_TS_MASK],
 		 conn->nrtx,
 		 conn->timer,