summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorguo <[email protected]>2021-12-10 18:41:29 +0800
committerGitHub <[email protected]>2021-12-10 18:41:29 +0800
commitc53879151b3c2810587c8b9b1dd5d09b5f79e0af (patch)
tree4c1133b6510b9dd60e430447c26400f51227da16 /src
parent2608699bfca8c5e12e99abe42a74965589c37b99 (diff)
parentec4e8cb2a41883b15fa94a1a420f33553b077fca (diff)
Merge pull request #5357 from mysterywolf/v4.0.x
[4.0.x] update release version to 4.0.5
Diffstat (limited to 'src')
-rw-r--r--src/Kconfig2
-rw-r--r--src/kservice.c6
2 files changed, 4 insertions, 4 deletions
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
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)