diff --git a/apps/program-handler/program-handler.c b/apps/program-handler/program-handler.c index 9673607d9..bbc384b87 100644 --- a/apps/program-handler/program-handler.c +++ b/apps/program-handler/program-handler.c @@ -43,7 +43,7 @@ * * This file is part of the Contiki desktop OS * - * $Id: program-handler.c,v 1.5 2007/08/30 14:39:18 matsutsuka Exp $ + * $Id: program-handler.c,v 1.6 2007/11/17 20:14:43 oliverschmidt Exp $ * */ @@ -265,10 +265,10 @@ program_handler_setscreensaver(char *name) } #endif /* CTK_CONF_SCREENSAVER */ /*-----------------------------------------------------------------------------------*/ +#ifdef WITH_LOADER_ARCH static void make_windows(void) { -#ifdef WITH_LOADER_ARCH ctk_window_new(&runwindow, 16, 3, "Run"); CTK_WIDGET_ADD(&runwindow, &namelabel); @@ -287,8 +287,8 @@ make_windows(void) CTK_WIDGET_ADD(&errordialog, &errortype); CTK_WIDGET_ADD(&errordialog, &errorokbutton); CTK_WIDGET_FOCUS(&errordialog, &errorokbutton); -#endif /* WITH_LOADER_ARCH */ } +#endif /* WITH_LOADER_ARCH */ /*-----------------------------------------------------------------------------------*/ PROCESS_THREAD(program_handler_process, ev, data) { diff --git a/apps/telnetd/telnetd.c b/apps/telnetd/telnetd.c index 4d42ab4c3..cb71655cc 100644 --- a/apps/telnetd/telnetd.c +++ b/apps/telnetd/telnetd.c @@ -28,7 +28,7 @@ * * This file is part of the Contiki desktop OS. * - * $Id: telnetd.c,v 1.6 2007/08/22 10:59:56 ksb Exp $ + * $Id: telnetd.c,v 1.7 2007/11/17 20:13:54 oliverschmidt Exp $ * */ @@ -276,7 +276,7 @@ sendopt(u8_t option, u8_t value) char *line; line = alloc_line(); if(line != NULL) { - line[0] = TELNET_IAC; + line[0] = (char)TELNET_IAC; line[1] = option; line[2] = value; line[3] = 0; diff --git a/platform/minimal-net/contiki-main.c b/platform/minimal-net/contiki-main.c index 635ae0fc1..f7e2cc7b8 100644 --- a/platform/minimal-net/contiki-main.c +++ b/platform/minimal-net/contiki-main.c @@ -29,7 +29,7 @@ * * This file is part of the Contiki OS * - * $Id: contiki-main.c,v 1.8 2007/05/23 22:02:26 oliverschmidt Exp $ + * $Id: contiki-main.c,v 1.9 2007/11/17 20:15:48 oliverschmidt Exp $ * */ @@ -61,7 +61,7 @@ main(void) procinit_init(); - autostart_start(autostart_processes); + autostart_start((struct process **)autostart_processes); uip_ipaddr(&addr, 192,168,2,2); uip_sethostaddr(&addr);