From ad4a8df425adec84df1a48d4800af215cdaf9888 Mon Sep 17 00:00:00 2001 From: oliverschmidt Date: Mon, 26 Mar 2007 23:01:11 +0000 Subject: [PATCH] Allow to build telnet-server example for targets not defining CTK_CONF_MAXMENUITEMS. --- apps/program-handler/program-handler.c | 4 ++-- core/ctk/ctk.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/program-handler/program-handler.c b/apps/program-handler/program-handler.c index 2f753169f..3b54b074c 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.3 2006/08/30 22:40:58 oliverschmidt Exp $ + * $Id: program-handler.c,v 1.4 2007/03/26 23:02:11 oliverschmidt Exp $ * */ @@ -336,7 +336,7 @@ PROCESS_THREAD(program_handler_process, ev, data) } #endif /* QUIT_MENU */ dscp = &contikidsc[0]; - for(i = 0; i < CTK_CONF_MAXMENUITEMS; ++i) { + for(i = 0; i < CTK_MAXMENUITEMS; ++i) { if(*dscp != NULL && data == (process_data_t)(*dscp)->icon) { RUN((*dscp)->prgname, (*dscp)->process, NULL); diff --git a/core/ctk/ctk.c b/core/ctk/ctk.c index 243f755d4..192e325d7 100644 --- a/core/ctk/ctk.c +++ b/core/ctk/ctk.c @@ -44,7 +44,7 @@ * * This file is part of the Contiki operating system. * - * $Id: ctk.c,v 1.4 2006/08/30 23:12:33 oliverschmidt Exp $ + * $Id: ctk.c,v 1.5 2007/03/26 23:01:11 oliverschmidt Exp $ * */ @@ -774,7 +774,7 @@ ctk_menuitem_add(CC_REGISTER_ARG struct ctk_menu *menu, char *name) { #if CTK_CONF_MENUS - if(menu->nitems == CTK_CONF_MAXMENUITEMS) { + if(menu->nitems == CTK_MAXMENUITEMS) { return 0; } menu->items[menu->nitems].title = name;