From c84d99706f33b312230969d845b2092815470439 Mon Sep 17 00:00:00 2001
From: "bernard.xiong@gmail.com" <bernard.xiong@gmail.com>
Date: Sat, 29 Dec 2012 04:12:14 +0000
Subject: [PATCH] fix some compiling warning.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2543 bbd45198-f89e-11dd-88c7-29a3b14d5316
---
 components/finsh/shell.c     | 2 +-
 components/finsh/shell.h     | 2 +-
 components/init/components.h | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/components/finsh/shell.c b/components/finsh/shell.c
index bede44329b..9fcfdd71f0 100644
--- a/components/finsh/shell.c
+++ b/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;
 }
 
 /**
diff --git a/components/finsh/shell.h b/components/finsh/shell.h
index 52def9c9d4..19d2c8c717 100644
--- a/components/finsh/shell.h
+++ b/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];
diff --git a/components/init/components.h b/components/init/components.h
index 9feb508f9e..c19813da3a 100644
--- a/components/init/components.h
+++ b/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
-- 
GitLab