Browse Source

Merge pull request #5357 from mysterywolf/v4.0.x

 [4.0.x] update release version to 4.0.5
guo 3 years ago
parent
commit
c53879151b
3 changed files with 6 additions and 5 deletions
  1. 2 1
      include/rtdef.h
  2. 1 1
      src/Kconfig
  3. 3 3
      src/kservice.c

+ 2 - 1
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) + \

+ 1 - 1
src/Kconfig

@@ -373,7 +373,7 @@ endmenu
 
 config RT_VER_NUM
     hex
-    default 0x40004
+    default 0x40005
     help
         RT-Thread version number
 

+ 3 - 3
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)