From ce16945cbab89543aa1e2674accfdbdd9fd8e686 Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Sun, 28 Aug 2022 13:25:47 -0400 Subject: [kernel][version] 采用新的版本宏定义 版本控制规范:https://semver.org/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 目前的版本子号不是很规范,其中RT_VERSION甚至和VS那边造成了冲突 ```c /* RT-Thread version information */ #define RT_VERSION 4L /**< major version number */ #define RT_SUBVERSION 1L /**< minor version number */ #define RT_REVISION 1L /**< revise version number */ ``` 参考ESP32: ```c /** Major version number (X.x.x) */ #define ESP_ARDUINO_VERSION_MAJOR 2 /** Minor version number (x.X.x) */ #define ESP_ARDUINO_VERSION_MINOR 0 /** Patch version number (x.x.X) */ #define ESP_ARDUINO_VERSION_PATCH 3 ``` 建议改成: ```c /* Major version number (X.x.x) */ #define RT_VERSION_MAJOR 4 /* Minor version number (x.X.x) */ #define RT_VERSION_MINOR 2 /* Patch version number (x.x.X) */ #define RT_VERSION_PATCH 0 ``` --- bsp/simulator/drivers/SConscript | 2 -- 1 file changed, 2 deletions(-) (limited to 'bsp/simulator/drivers/SConscript') diff --git a/bsp/simulator/drivers/SConscript b/bsp/simulator/drivers/SConscript index d43216fa34..101b630ae1 100644 --- a/bsp/simulator/drivers/SConscript +++ b/bsp/simulator/drivers/SConscript @@ -21,8 +21,6 @@ if rtconfig.CROSS_TOOL == 'msvc': '_CRT_NO_TIME_T', # disable deprecation of unsafe functions, such as strncpy '_CRT_SECURE_NO_WARNINGS', - # RT_VESRION conflicts in winuser.h - 'NORESOURCE', # lean and mean for Windows.h, exclude winsock.h when include Windows.h # avoid conlicts between sys/select.h, time.h, and winsock.h # such as fd_set related, struct timeval... -- cgit v1.3.1