summaryrefslogtreecommitdiff
path: root/components
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2013-09-25 20:57:46 -0700
committerBernard Xiong <[email protected]>2013-09-25 20:57:46 -0700
commitbfc0d8c91d47039b3a85c744523c75345ea3e518 (patch)
tree7077d3617a92d79d86a06062cb7a5f4aef1fa682 /components
parent0b844aa82d6efcab0655380ca6716fbe4c183bd6 (diff)
parentdf4e8ff060fc2d3f6092df0e9ba75ffba0650a1e (diff)
Merge pull request #163 from grissiom/compiling-fix
Compiling fix
Diffstat (limited to 'components')
-rw-r--r--components/finsh/msh_cmd.c2
-rw-r--r--components/utilities/logtrace/log_file.c3
2 files changed, 5 insertions, 0 deletions
diff --git a/components/finsh/msh_cmd.c b/components/finsh/msh_cmd.c
index fac90479c8..cffb374c2e 100644
--- a/components/finsh/msh_cmd.c
+++ b/components/finsh/msh_cmd.c
@@ -136,6 +136,7 @@ int cmd_rm(int argc, char** argv)
}
FINSH_FUNCTION_EXPORT_ALIAS(cmd_rm, __cmd_rm, "Remove (unlink) the FILE(s).");
+#ifdef DFS_USING_WORKDIR
int cmd_cd(int argc, char** argv)
{
if (argc == 1)
@@ -157,6 +158,7 @@ int cmd_pwd(int argc, char** argv)
return 0;
}
FINSH_FUNCTION_EXPORT_ALIAS(cmd_pwd, __cmd_pwd, Print the name of the current working directory.);
+#endif
int cmd_mkdir(int argc, char** argv)
{
diff --git a/components/utilities/logtrace/log_file.c b/components/utilities/logtrace/log_file.c
index 72e4724b63..2f4a28b63c 100644
--- a/components/utilities/logtrace/log_file.c
+++ b/components/utilities/logtrace/log_file.c
@@ -121,6 +121,9 @@ void log_trace_set_file(const char *filename)
log_trace_file_init(filename);
log_trace_set_device("logfile");
}
+#ifdef RT_USING_FINSH
+#include <finsh.h>
FINSH_FUNCTION_EXPORT_ALIAS(log_trace_set_file, log_file, set output filename of log trace);
+#endif
#endif /* RT_USING_DFS */