From b2c7d265f2b7b406c1cbdd8b41f50f0155b5f35e Mon Sep 17 00:00:00 2001 From: "bernard.xiong@gmail.com" Date: Sat, 4 Jun 2011 13:34:02 +0000 Subject: [PATCH] add malloc, realloc etc implementation in minilibc. git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1452 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- components/libc/minilibc/stdlib.c | 20 ++++++++++++++++++++ components/libc/minilibc/stdlib.h | 12 ++++++------ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/components/libc/minilibc/stdlib.c b/components/libc/minilibc/stdlib.c index 7c14036351..b5c3206e28 100644 --- a/components/libc/minilibc/stdlib.c +++ b/components/libc/minilibc/stdlib.c @@ -38,4 +38,24 @@ int atoi(const char* s) return sign==-1?-v:v; } +void *malloc(size_t size) +{ + return rt_malloc(size); +} + +void free(void *ptr) +{ + rt_free(ptr); +} + +void *realloc(void *ptr, size_t size) +{ + return rt_realloc(ptr, size); +} + +void *calloc(size_t nelem, size_t elsize) +{ + return rt_calloc(nelem, elsize); +} + #endif diff --git a/components/libc/minilibc/stdlib.h b/components/libc/minilibc/stdlib.h index e91a176089..9b87743242 100644 --- a/components/libc/minilibc/stdlib.h +++ b/components/libc/minilibc/stdlib.h @@ -19,12 +19,6 @@ #if !defined (RT_USING_NEWLIB) && defined (RT_USING_MINILIBC) int atoi(const char *nptr); -#endif - -#define malloc rt_malloc -#define free rt_free -#define realloc rt_realloc -#define calloc rt_calloc int rand(void); int rand_r(unsigned int *seed); @@ -32,4 +26,10 @@ void srand(unsigned int seed); void qsort(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *)); +void *malloc(size_t size); +void free(void *ptr); +void *realloc(void *ptr, size_t size); +void *calloc(size_t nelem, size_t elsize); +#endif + #endif