diff options
| author | latercomer <[email protected]> | 2025-03-16 01:06:58 +0800 |
|---|---|---|
| committer | Rbb666 <[email protected]> | 2025-03-17 16:45:59 +0800 |
| commit | 76c2f2d77f06327b5a6d679d59d06443d65299ca (patch) | |
| tree | 07cccaac899216a399e55f6d9df91fe3c84c3cbf | |
| parent | b0b40ed45c8d92ced70b236d45cf873fae4a6665 (diff) | |
解决bps/simulator无法在vs2019环境下编译
Signed-off-by: latercomer <[email protected]>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | bsp/simulator/template_vs2012.vcxproj | 1 | ||||
| -rw-r--r-- | components/finsh/finsh.h | 8 | ||||
| -rw-r--r-- | src/scheduler_up.c | 1 |
4 files changed, 11 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 7f7bab74a7..72a8882ed4 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ *.crf build Debug +.vs rtthread settings documentation/html diff --git a/bsp/simulator/template_vs2012.vcxproj b/bsp/simulator/template_vs2012.vcxproj index 0ace659065..914efbc809 100644 --- a/bsp/simulator/template_vs2012.vcxproj +++ b/bsp/simulator/template_vs2012.vcxproj @@ -44,6 +44,7 @@ <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions> + <LanguageStandard_C>stdc11</LanguageStandard_C> </ClCompile> <Link> <AdditionalDependencies>winmm.lib;Packet.lib;wpcap.lib;%(AdditionalDependencies)</AdditionalDependencies> diff --git a/components/finsh/finsh.h b/components/finsh/finsh.h index 5c97ccd731..d9ddec5983 100644 --- a/components/finsh/finsh.h +++ b/components/finsh/finsh.h @@ -212,14 +212,22 @@ typedef struct msh_cmd_opt * * @param[in] command The command associated with these options. */ +#ifdef _MSC_VER +#define CMD_OPTIONS_STATEMENT(command) static struct msh_cmd_opt command##_msh_options[16]; +#else #define CMD_OPTIONS_STATEMENT(command) static struct msh_cmd_opt command##_msh_options[]; +#endif /** * @brief Starts the definition of command options for a specific command. * * @param[in] command The command these options are associated with. */ +#ifdef _MSC_VER +#define CMD_OPTIONS_NODE_START(command) static struct msh_cmd_opt command##_msh_options[16] = { +#else #define CMD_OPTIONS_NODE_START(command) static struct msh_cmd_opt command##_msh_options[] = { +#endif /** * @brief Defines a single command option. diff --git a/src/scheduler_up.c b/src/scheduler_up.c index 693cfcae0e..95e3cc7fb6 100644 --- a/src/scheduler_up.c +++ b/src/scheduler_up.c @@ -32,6 +32,7 @@ * 2023-10-17 ChuShicheng Modify the timing of clearing RT_THREAD_STAT_YIELD flag bits */ +#define __RT_IPC_SOURCE__ #include <rtthread.h> #include <rthw.h> |