deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Allow to build telnet-server example for targets not defining CTK_CONF_MAXMENUITEMS.

Browse source
This commit is contained in:
oliverschmidt 2007-03-26 23:01:11 +00:00
parent f60b7aabcf
commit ad4a8df425
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/program-handler/program-handler.c
View file

@ -43,7 +43,7 @@
* *
* This file is part of the Contiki desktop OS * 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 */ #endif /* QUIT_MENU */
dscp = &contikidsc[0]; dscp = &contikidsc[0];
for(i = 0; i < CTK_CONF_MAXMENUITEMS; ++i) { for(i = 0; i < CTK_MAXMENUITEMS; ++i) {
if(*dscp != NULL && if(*dscp != NULL &&
data == (process_data_t)(*dscp)->icon) { data == (process_data_t)(*dscp)->icon) {
RUN((*dscp)->prgname, (*dscp)->process, NULL); RUN((*dscp)->prgname, (*dscp)->process, NULL);

4
core/ctk/ctk.c
View file

@ -44,7 +44,7 @@
* *
* This file is part of the Contiki operating system. * 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) char *name)
{ {
#if CTK_CONF_MENUS #if CTK_CONF_MENUS
if(menu->nitems == CTK_CONF_MAXMENUITEMS) { if(menu->nitems == CTK_MAXMENUITEMS) {
return 0; return 0;
} }
menu->items[menu->nitems].title = name; menu->items[menu->nitems].title = name;