From 45c44e23d73ee0015a5bb0861d40911141223914 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Sat, 9 Feb 2013 21:49:00 +0100 Subject: [PATCH] There's no point in ctk_restore() for standalone GUI builds. --- platform/win32/contiki-main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/platform/win32/contiki-main.c b/platform/win32/contiki-main.c index 5774bd9a8..3ec2ec155 100644 --- a/platform/win32/contiki-main.c +++ b/platform/win32/contiki-main.c @@ -112,19 +112,19 @@ main(void) #if !UIP_CONF_IPV6 { uip_ipaddr_t addr; - uip_ipaddr(&addr, 10,1,1,1); + uip_ipaddr(&addr, 192,168,0,111); uip_sethostaddr(&addr); log_message("IP Address: ", inet_ntoa(*(struct in_addr*)&addr)); - uip_ipaddr(&addr, 255,0,0,0); + uip_ipaddr(&addr, 255,255,255,0); uip_setnetmask(&addr); log_message("Subnet Mask: ", inet_ntoa(*(struct in_addr*)&addr)); - uip_ipaddr(&addr, 10,1,1,100); + uip_ipaddr(&addr, 192,168,0,1); uip_setdraddr(&addr); log_message("Def. Router: ", inet_ntoa(*(struct in_addr*)&addr)); - uip_ipaddr(&addr, 10,1,1,100); + uip_ipaddr(&addr, 192,168,0,1); resolv_conf(&addr); log_message("DNS Server: ", inet_ntoa(*(struct in_addr*)&addr)); } @@ -159,11 +159,11 @@ main(void) /* Allow user-mode APC to execute. */ SleepEx(10, TRUE); -#if WITH_GUI +#ifdef PLATFORM_BUILD if(console_resize()) { ctk_restore(); } -#endif /* WITH_GUI */ +#endif /* PLATFORM_BUILD */ } } /*-----------------------------------------------------------------------------------*/