diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1998-10-01 21:44:31 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1998-10-01 21:44:31 +0000 |
commit | 388be68fbc53b592918ea662f1c0e1571c5a9c1f (patch) | |
tree | b5fba8e0542c47da34e02091f9265c72cdfa3984 | |
parent | changed version to 981001 (diff) | |
download | rtems-388be68fbc53b592918ea662f1c0e1571c5a9c1f.tar.bz2 |
Patch from Ian Lance Taylor <ian@airs.com>:
The reentrant versions of the malloc functions in
c/src/lib/libc/malloc.c
do not match the definitions in newlib. These will be used if you use
newlib routines such as fdopen. I believe this patch to malloc.c is
needed to provide the correct versions.
-rw-r--r-- | c/src/exec/libcsupport/src/malloc.c | 13 | ||||
-rw-r--r-- | c/src/lib/libc/malloc.c | 13 | ||||
-rw-r--r-- | cpukit/libcsupport/src/malloc.c | 13 |
3 files changed, 24 insertions, 15 deletions
diff --git a/c/src/exec/libcsupport/src/malloc.c b/c/src/exec/libcsupport/src/malloc.c index db408ec050..fac38585a7 100644 --- a/c/src/exec/libcsupport/src/malloc.c +++ b/c/src/exec/libcsupport/src/malloc.c @@ -387,7 +387,7 @@ void malloc_walk(size_t source, size_t printf_enabled) */ #ifdef RTEMS_NEWLIB -void *malloc_r( +void *_malloc_r( struct _reent *ignored, size_t size ) @@ -395,7 +395,8 @@ void *malloc_r( return malloc( size ); } -void *calloc_r( +void *_calloc_r( + struct _reent *ignored, size_t nelem, size_t elsize ) @@ -403,15 +404,17 @@ void *calloc_r( return calloc( nelem, elsize ); } -void *realloc_r( +void *_realloc_r( + struct _reent *ignored, void *ptr, size_t size ) { - return realloc_r( ptr, size ); + return realloc( ptr, size ); } -void free_r( +void _free_r( + struct _reent *ignored, void *ptr ) { diff --git a/c/src/lib/libc/malloc.c b/c/src/lib/libc/malloc.c index db408ec050..fac38585a7 100644 --- a/c/src/lib/libc/malloc.c +++ b/c/src/lib/libc/malloc.c @@ -387,7 +387,7 @@ void malloc_walk(size_t source, size_t printf_enabled) */ #ifdef RTEMS_NEWLIB -void *malloc_r( +void *_malloc_r( struct _reent *ignored, size_t size ) @@ -395,7 +395,8 @@ void *malloc_r( return malloc( size ); } -void *calloc_r( +void *_calloc_r( + struct _reent *ignored, size_t nelem, size_t elsize ) @@ -403,15 +404,17 @@ void *calloc_r( return calloc( nelem, elsize ); } -void *realloc_r( +void *_realloc_r( + struct _reent *ignored, void *ptr, size_t size ) { - return realloc_r( ptr, size ); + return realloc( ptr, size ); } -void free_r( +void _free_r( + struct _reent *ignored, void *ptr ) { diff --git a/cpukit/libcsupport/src/malloc.c b/cpukit/libcsupport/src/malloc.c index db408ec050..fac38585a7 100644 --- a/cpukit/libcsupport/src/malloc.c +++ b/cpukit/libcsupport/src/malloc.c @@ -387,7 +387,7 @@ void malloc_walk(size_t source, size_t printf_enabled) */ #ifdef RTEMS_NEWLIB -void *malloc_r( +void *_malloc_r( struct _reent *ignored, size_t size ) @@ -395,7 +395,8 @@ void *malloc_r( return malloc( size ); } -void *calloc_r( +void *_calloc_r( + struct _reent *ignored, size_t nelem, size_t elsize ) @@ -403,15 +404,17 @@ void *calloc_r( return calloc( nelem, elsize ); } -void *realloc_r( +void *_realloc_r( + struct _reent *ignored, void *ptr, size_t size ) { - return realloc_r( ptr, size ); + return realloc( ptr, size ); } -void free_r( +void _free_r( + struct _reent *ignored, void *ptr ) { |