Skip to content

Commit c538791

Browse files
authored
Merge pull request #5357 from mysterywolf/v4.0.x
[4.0.x] update release version to 4.0.5
2 parents 2608699 + ec4e8cb commit c538791

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

include/rtdef.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
* 2020-10-23 Meco Man define maximum value of ipc type
3737
* 2021-03-19 Meco Man add security devices
3838
* 2021-05-10 armink change version number to v4.0.4
39+
* 2021-12-09 Meco Man change version number to v4.0.5
3940
*/
4041

4142
#ifndef __RT_DEF_H__
@@ -57,7 +58,7 @@ extern "C" {
5758
/* RT-Thread version information */
5859
#define RT_VERSION 4L /**< major version number */
5960
#define RT_SUBVERSION 0L /**< minor version number */
60-
#define RT_REVISION 4L /**< revise version number */
61+
#define RT_REVISION 5L /**< revise version number */
6162

6263
/* RT-Thread version */
6364
#define RTTHREAD_VERSION ((RT_VERSION * 10000) + \

src/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ endmenu
373373

374374
config RT_VER_NUM
375375
hex
376-
default 0x40004
376+
default 0x40005
377377
help
378378
RT-Thread version number
379379

src/kservice.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ RTM_EXPORT(_rt_errno);
127127
*
128128
* @return The address of source memory.
129129
*/
130-
RT_WEAK void *rt_memset(void *s, int c, rt_ubase_t count)
130+
void *rt_memset(void *s, int c, rt_ubase_t count)
131131
{
132132
#ifdef RT_KSERVICE_USING_TINY_SIZE
133133
char *xs = (char *)s;
@@ -338,7 +338,7 @@ RTM_EXPORT(rt_memmove);
338338
* If the result > 0, cs is greater than ct.
339339
* If the result = 0, cs is equal to ct.
340340
*/
341-
RT_WEAK rt_int32_t rt_memcmp(const void *cs, const void *ct, rt_ubase_t count)
341+
rt_int32_t rt_memcmp(const void *cs, const void *ct, rt_ubase_t count)
342342
{
343343
const unsigned char *su1, *su2;
344344
int res = 0;
@@ -842,7 +842,7 @@ static char *print_number(char *buf,
842842
*
843843
* @return The number of characters actually written to buffer.
844844
*/
845-
rt_int32_t rt_vsnprintf(char *buf,
845+
RT_WEAK rt_int32_t rt_vsnprintf(char *buf,
846846
rt_size_t size,
847847
const char *fmt,
848848
va_list args)

0 commit comments

Comments
 (0)