瀏覽代碼

fix some compiling warning.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2543 bbd45198-f89e-11dd-88c7-29a3b14d5316
bernard.xiong@gmail.com 12 年之前
父節點
當前提交
c84d99706f
共有 3 個文件被更改,包括 4 次插入3 次删除
  1. 1 1
      components/finsh/shell.c
  2. 1 1
      components/finsh/shell.h
  3. 2 1
      components/init/components.h

+ 1 - 1
components/finsh/shell.c

@@ -166,7 +166,7 @@ const char* finsh_get_device()
 void finsh_set_echo(rt_uint32_t echo)
 {
 	RT_ASSERT(shell != RT_NULL);
-	shell->echo_mode = echo;
+	shell->echo_mode = (rt_uint8_t)echo;
 }
 
 /**

+ 1 - 1
components/finsh/shell.h

@@ -57,7 +57,7 @@ struct finsh_shell
 	rt_uint8_t use_history:1;
 
 #ifdef FINSH_USING_HISTORY
-	rt_uint8_t current_history;
+	rt_uint16_t current_history;
 	rt_uint16_t history_count;
 
 	char cmd_history[FINSH_HISTORY_LINES][FINSH_CMD_SIZE];

+ 2 - 1
components/init/components.h

@@ -31,10 +31,11 @@ extern void lwip_system_init(void);
 
 #ifdef RT_USING_DFS
 #include <dfs_init.h>
+#include <dfs_fs.h>
 #ifdef RT_USING_DFS_ELMFAT
 #include <dfs_elm.h>
 #endif
-#ifdef RT_USING_DFS_NFS
+#if defined(RT_USING_LWIP) && defined(RT_USING_DFS_NFS)
 #include <dfs_nfs.h>
 #endif
 #ifdef RT_USING_DFS_ROMFS