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/win32/contiki-main.c

@@ -30,7 +30,7 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: contiki-main.c,v 1.18 2010/10/15 21:14:18 oliverschmidt Exp $
+ * $Id: contiki-main.c,v 1.19 2010/10/19 18:29:05 adamdunkels Exp $
  */
 
 #define WIN32_LEAN_AND_MEAN
@@ -39,8 +39,8 @@
 #include <stdio.h>
 
 /* Avoid 'conflicting types' errors. */
-#define htonl
-#define htons
+#define uip_htonl
+#define uip_htons
 
 #include "contiki-net.h"