Changed #ifdef to #if for checking CONF flag to be more consistent with predominant coding style.

This commit is contained in:
oliverschmidt 2007-04-14 08:11:24 +00:00
parent 8f0753c402
commit 525108f957

View File

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki desktop OS. * This file is part of the Contiki desktop OS.
* *
* $Id: shell.c,v 1.3 2007/04/13 21:05:57 oliverschmidt Exp $ * $Id: shell.c,v 1.4 2007/04/14 08:11:24 oliverschmidt Exp $
* *
*/ */
@ -133,7 +133,7 @@ nullterminate(char *str)
return nt; return nt;
} }
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
#ifdef SHELL_CONF_WITH_PROGRAM_HANDLER #if SHELL_CONF_WITH_PROGRAM_HANDLER
static void static void
runfile(char *str) runfile(char *str)
{ {
@ -181,7 +181,7 @@ static void
help(char *str) help(char *str)
{ {
shell_output("Available commands:", ""); shell_output("Available commands:", "");
#ifdef SHELL_CONF_WITH_PROGRAM_HANDLER #if SHELL_CONF_WITH_PROGRAM_HANDLER
shell_output("run - start program", ""); shell_output("run - start program", "");
shell_output("exec - start program & exit shell", ""); shell_output("exec - start program & exit shell", "");
#endif #endif
@ -214,7 +214,7 @@ none(char *str)
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
static struct ptentry configparsetab[] = static struct ptentry configparsetab[] =
{ {
#ifdef SHELL_CONF_WITH_PROGRAM_HANDLER #if SHELL_CONF_WITH_PROGRAM_HANDLER
{'e', 'E', execfile}, {'e', 'E', execfile},
{'r', 'R', runfile}, {'r', 'R', runfile},
#endif #endif