summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author[email protected] <[email protected]>2012-10-24 08:55:27 +0000
committer[email protected] <[email protected]>2012-10-24 08:55:27 +0000
commit61bec5b56075d3030b4d576b7b475835206256d9 (patch)
treeda39d98757ed63640644fef70ba674a69588f0f9
parente956eedc2043c2636d7e4d6036362f761c1e4499 (diff)
update bsp/simulator, add component head path, fix atoi redefinition compile error in application.c
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2370 bbd45198-f89e-11dd-88c7-29a3b14d5316
-rw-r--r--bsp/simulator/application.c7
-rw-r--r--bsp/simulator/vs2005.vcproj2
2 files changed, 7 insertions, 2 deletions
diff --git a/bsp/simulator/application.c b/bsp/simulator/application.c
index 8151684091..7bbe6f4cb9 100644
--- a/bsp/simulator/application.c
+++ b/bsp/simulator/application.c
@@ -91,7 +91,12 @@ int rt_application_init()
return 0;
}
-#include <stdlib.h>
+#ifndef _CRT_TERMINATE_DEFINED
+#define _CRT_TERMINATE_DEFINED
+_CRTIMP __declspec(noreturn) void __cdecl exit(__in int _Code);
+_CRTIMP __declspec(noreturn) void __cdecl _exit(__in int _Code);
+_CRTIMP void __cdecl abort(void);
+#endif
void rt_hw_exit(void)
{
rt_kprintf("RT-Thread, bye\n");
diff --git a/bsp/simulator/vs2005.vcproj b/bsp/simulator/vs2005.vcproj
index 7bd64324a9..55c3413165 100644
--- a/bsp/simulator/vs2005.vcproj
+++ b/bsp/simulator/vs2005.vcproj
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".\;..\..\include;..\..\bsp\vs2008;..\..\components\finsh;..\..\components\dfs\include;..\..\components\dfs\filesystems\uffs\src\inc\;..\..\components\dfs\filesystems\uffs;..\..\components\drivers\include;..\..\components\dfs\filesystems\jffs2\src;..\..\components\dfs\filesystems\jffs2\kernel;..\..\components\dfs\filesystems\jffs2\include;..\..\components\dfs\filesystems\jffs2\;..\..\components\dfs\filesystems\jffs2\cyg\compress"
+ AdditionalIncludeDirectories=".\;..\..\include;..\..\bsp\vs2008;..\..\components\finsh;..\..\components\dfs\include;..\..\components\dfs\filesystems\uffs\src\inc\;..\..\components\dfs\filesystems\uffs;..\..\components\drivers\include;..\..\components\dfs\filesystems\jffs2\src;..\..\components\dfs\filesystems\jffs2\kernel;..\..\components\dfs\filesystems\jffs2\include;..\..\components\dfs\filesystems\jffs2\;..\..\components\dfs\filesystems\jffs2\cyg\compress;..\..\components\init"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;MSVC;_TIME_T_DEFINED"
MinimalRebuild="true"
BasicRuntimeChecks="3"