From 388be68fbc53b592918ea662f1c0e1571c5a9c1f Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Thu, 1 Oct 1998 21:44:31 +0000
Subject: 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.
---
 c/src/exec/libcsupport/src/malloc.c | 13 ++++++++-----
 c/src/lib/libc/malloc.c             | 13 ++++++++-----
 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
 )
 {
-- 
cgit v1.2.3