From cf57e00d60c9b8126dead73b2117e8d7f3dd3e26 Mon Sep 17 00:00:00 2001
From: adamdunkels <adamdunkels>
Date: Wed, 20 Sep 2006 19:06:41 +0000
Subject: [PATCH] uip_ipaddr_t changes fixed thanks to Marcelo Barros

---
 apps/cmdd/cmdd.c            |  6 +++---
 platform/gtk/contiki-main.c | 30 +++++++++++++++---------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/apps/cmdd/cmdd.c b/apps/cmdd/cmdd.c
index 854f92ae2..8ad31869c 100644
--- a/apps/cmdd/cmdd.c
+++ b/apps/cmdd/cmdd.c
@@ -145,14 +145,14 @@ appcall(void *state)
 /*---------------------------------------------------------------------------*/
 PROCESS_THREAD(cmdd_process, ev, data)
 {
-  u16_t ipaddr[2];
+  uip_ipaddr_t ipaddr;
   
   PROCESS_BEGIN();
   
   tcp_listen(HTONS(6581));
   memb_init(&conns);
-  uip_ipaddr(ipaddr, 255,255,255,255);
-  udpconn = udp_new(ipaddr, HTONS(6712), NULL);
+  uip_ipaddr(&ipaddr, 255,255,255,255);
+  udpconn = udp_new(&ipaddr, HTONS(6712), NULL);
 
   while(1) {
     PROCESS_WAIT_EVENT();
diff --git a/platform/gtk/contiki-main.c b/platform/gtk/contiki-main.c
index 59fe25a0d..d5ec646cd 100644
--- a/platform/gtk/contiki-main.c
+++ b/platform/gtk/contiki-main.c
@@ -29,7 +29,7 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: contiki-main.c,v 1.1 2006/06/17 22:41:29 adamdunkels Exp $
+ * $Id: contiki-main.c,v 1.2 2006/09/20 19:06:41 adamdunkels Exp $
  *
  */
 
@@ -77,18 +77,18 @@ PROCESS(init_process, "Init");
 
 PROCESS_THREAD(init_process, ev, data)
 {
-  u16_t addr[2];
+  uip_ipaddr_t addr;
 
   PROCESS_BEGIN();
   
-  uip_ipaddr(addr, 192,168,2,2);
-  uip_sethostaddr(addr);
+  uip_ipaddr(&addr, 192,168,2,2);
+  uip_sethostaddr(&addr);
 
-  uip_ipaddr(addr, 192,168,2,1);
-  uip_setdraddr(addr);
+  uip_ipaddr(&addr, 192,168,2,1);
+  uip_setdraddr(&addr);
 
-  uip_ipaddr(addr, 255,255,255,0);
-  uip_setnetmask(addr);
+  uip_ipaddr(&addr, 255,255,255,0);
+  uip_setnetmask(&addr);
 
   printf("init\n");
   
@@ -132,7 +132,7 @@ idle_callback(gpointer data)
 int
 main(int argc, char **argv)
 {
-  u16_t addr[2];
+  uip_ipaddr_t addr;
   
 
   gtk_init(&argc, &argv);
@@ -141,14 +141,14 @@ main(int argc, char **argv)
 
   procinit_init();
   
-  uip_ipaddr(addr, 192,168,2,2);
-  uip_sethostaddr(addr);
+  uip_ipaddr(&addr, 192,168,2,2);
+  uip_sethostaddr(&addr);
 
-  uip_ipaddr(addr, 192,168,2,1);
-  uip_setdraddr(addr);
+  uip_ipaddr(&addr, 192,168,2,1);
+  uip_setdraddr(&addr);
 
-  uip_ipaddr(addr, 255,255,255,0);
-  uip_setnetmask(addr);
+  uip_ipaddr(&addr, 255,255,255,0);
+  uip_setnetmask(&addr);
 
   /*  program_handler_add(&netconf_dsc, "Network setup", 1);
   program_handler_add(&ftp_dsc, "FTP client", 1);