From 5c838db7847ed6a8f7e7dec2248962d8d84f6c02 Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Thu, 9 Dec 2021 16:05:46 -0500 Subject: [PATCH 1/2] [4.0.x] update release version to 4.0.5 --- include/rtdef.h | 3 ++- src/Kconfig | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/rtdef.h b/include/rtdef.h index a324eea122..8c60fa7c61 100644 --- a/include/rtdef.h +++ b/include/rtdef.h @@ -36,6 +36,7 @@ * 2020-10-23 Meco Man define maximum value of ipc type * 2021-03-19 Meco Man add security devices * 2021-05-10 armink change version number to v4.0.4 + * 2021-12-09 Meco Man change version number to v4.0.5 */ #ifndef __RT_DEF_H__ @@ -57,7 +58,7 @@ extern "C" { /* RT-Thread version information */ #define RT_VERSION 4L /**< major version number */ #define RT_SUBVERSION 0L /**< minor version number */ -#define RT_REVISION 4L /**< revise version number */ +#define RT_REVISION 5L /**< revise version number */ /* RT-Thread version */ #define RTTHREAD_VERSION ((RT_VERSION * 10000) + \ diff --git a/src/Kconfig b/src/Kconfig index fc7fcd54f4..f935eaeb91 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -373,7 +373,7 @@ endmenu config RT_VER_NUM hex - default 0x40004 + default 0x40005 help RT-Thread version number From ec4e8cb2a41883b15fa94a1a420f33553b077fca Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Thu, 9 Dec 2021 16:07:28 -0500 Subject: [PATCH 2/2] [4.0.x] add weak symbol to rt_vsnprintf --- src/kservice.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/kservice.c b/src/kservice.c index 4ed30f3237..e629a1e2ff 100644 --- a/src/kservice.c +++ b/src/kservice.c @@ -127,7 +127,7 @@ RTM_EXPORT(_rt_errno); * * @return The address of source memory. */ -RT_WEAK void *rt_memset(void *s, int c, rt_ubase_t count) +void *rt_memset(void *s, int c, rt_ubase_t count) { #ifdef RT_KSERVICE_USING_TINY_SIZE char *xs = (char *)s; @@ -338,7 +338,7 @@ RTM_EXPORT(rt_memmove); * If the result > 0, cs is greater than ct. * If the result = 0, cs is equal to ct. */ -RT_WEAK rt_int32_t rt_memcmp(const void *cs, const void *ct, rt_ubase_t count) +rt_int32_t rt_memcmp(const void *cs, const void *ct, rt_ubase_t count) { const unsigned char *su1, *su2; int res = 0; @@ -842,7 +842,7 @@ static char *print_number(char *buf, * * @return The number of characters actually written to buffer. */ -rt_int32_t rt_vsnprintf(char *buf, +RT_WEAK rt_int32_t rt_vsnprintf(char *buf, rt_size_t size, const char *fmt, va_list args)