RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

Patch from Ian Lance Taylor <ian@airs.com>:

Browse Source 
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.
This commit is contained in:
Joel Sherrill
1998-10-01 21:44:31 +00:00
parent f0bca9fb67
commit 388be68fbc
3 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
c/src/exec/libcsupport/src/malloc.c
View File

@@ -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
)
{

13
c/src/lib/libc/malloc.c
View File

@@ -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
)
{