Merge branch 'master' of https://github.com/RT-Thread/rt-thread into nuvoton

# Conflicts:
#	bsp/nuvoton/nk-980iot/.config
#	bsp/nuvoton/nk-n9h30/.config
#	bsp/nuvoton/nk-rtu980/.config
#	bsp/nuvoton/numaker-iot-m487/.config
#	bsp/nuvoton/numaker-m2354/.config
#	bsp/nuvoton/numaker-pfm-m487/.config

1 files changed, 7 insertions, 3 deletions

diff --git a/src/kservice.c b/src/kservice.c
index fa0da4c7c4..459109ce75 100644
--- a/src/kservice.c
+++ b/src/kservice.c
@@ -116,6 +116,7 @@ int *_rt_errno(void)
 }
 RTM_EXPORT(_rt_errno);
 
+#ifndef RT_KSERVICE_USING_STDLIB_MEMSET
 /**
  * This function will set the content of memory to specified value.
  *
@@ -201,7 +202,9 @@ RT_WEAK void *rt_memset(void *s, int c, rt_ubase_t count)
 #endif /* RT_KSERVICE_USING_TINY_SIZE */
 }
 RTM_EXPORT(rt_memset);
+#endif /* RT_KSERVICE_USING_STDLIB_MEMSET */
 
+#ifndef RT_KSERVICE_USING_STDLIB_MEMCPY
 /**
  * This function will copy memory content from source address to destination address.
  *
@@ -285,6 +288,7 @@ RT_WEAK void *rt_memcpy(void *dst, const void *src, rt_ubase_t count)
 #endif /* RT_KSERVICE_USING_TINY_SIZE */
 }
 RTM_EXPORT(rt_memcpy);
+#endif /* RT_KSERVICE_USING_STDLIB_MEMCPY */
 
 #ifndef RT_KSERVICE_USING_STDLIB
 
@@ -1558,9 +1562,9 @@ RTM_EXPORT(rt_free);
 *
 * @param max_used is a pointer to get the maximum memory used.
 */
-RT_WEAK void rt_memory_info(rt_uint32_t *total,
-                            rt_uint32_t *used,
-                            rt_uint32_t *max_used)
+RT_WEAK void rt_memory_info(rt_size_t *total,
+                            rt_size_t *used,
+                            rt_size_t *max_used)
 {
     rt_base_t level;