3 files changed, 4 insertions, 7 deletions
diff --git a/bsp/simulator/drivers/SConscript b/bsp/simulator/drivers/SConscript
index d5a82f93b7..8f0c9275ff 100644
--- a/bsp/simulator/drivers/SConscript
+++ b/bsp/simulator/drivers/SConscript
@@ -8,8 +8,6 @@ LIBS = []
 LIBPATH = []
 CPPPATH = [cwd]
 
-CPPDEFINES = ['_CRT_DECLARE_NONSTDC_NAMES=0'] # avoid to conflict with the inherent STDC in VS
-
 # remove no need file.
 if GetDepend('PKG_USING_GUIENGINE') == False:
     SrcRemove(src, 'sdl_fb.c')
@@ -32,8 +30,7 @@ if GetDepend('RT_USING_DFS') == False or GetDepend('RT_USING_MODULE') == False:
 if sys.platform[0:5]=="linux": #check whether under linux
     SrcRemove(src, ['module_win32.c', 'dfs_win32.c'])
 
-group = DefineGroup('Drivers', src, depend = [''],
-                    CPPPATH = CPPPATH, LIBS=LIBS, LIBPATH=LIBPATH, CPPDEFINES = CPPDEFINES)
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH, LIBS=LIBS, LIBPATH=LIBPATH)
 
 list = os.listdir(cwd)
 for item in list:
diff --git a/bsp/simulator/drivers/board.c b/bsp/simulator/drivers/board.c
index 39c48aa41b..5ac01ed43b 100755
--- a/bsp/simulator/drivers/board.c
+++ b/bsp/simulator/drivers/board.c
@@ -101,7 +101,7 @@ int rt_hw_board_init(void)
     rt_thread_idle_sethook(rt_hw_win32_low_cpu);
 #endif
 
-#if defined(RT_USING_CONSOLE)
+#if defined(RT_USING_CONSOLE) && defined(RT_USING_DEVICE)
     rt_console_set_device(RT_CONSOLE_DEVICE_NAME);
 #endif
     /* init board */
diff --git a/bsp/simulator/drivers/dfs_win32.c b/bsp/simulator/drivers/dfs_win32.c
index 230425f3e4..95bfba030f 100644
--- a/bsp/simulator/drivers/dfs_win32.c
+++ b/bsp/simulator/drivers/dfs_win32.c
@@ -194,7 +194,7 @@ static int dfs_win32_open(struct dfs_fd *file)
         wdirp->start = malloc(len); //not rt_malloc!
         wdirp->end = wdirp->curr = wdirp->start;
         wdirp->end += len;
-        strncpy(wdirp->curr, wdirp->finddata.name, len);
+        rt_strncpy(wdirp->curr, wdirp->finddata.name, len);
 
         file->data = (void *)wdirp;
         rt_free(file_path);
@@ -361,7 +361,7 @@ static int dfs_win32_getdents(struct dfs_fd *file, struct dirent *dirp, rt_uint3
             wdirp->start = realloc(wdirp->start, wdirp->end - wdirp->start + name_len);
             wdirp->curr = wdirp->start + (wdirp->curr - old_start);
             wdirp->end = wdirp->curr + name_len;
-            strcpy(wdirp->curr, wdirp->finddata.name);
+            rt_strcpy(wdirp->curr, wdirp->finddata.name);
         }
         else
         {