Context Navigation

← Previous Changeset
Next Changeset →

Changeset 388be68f in rtems

Timestamp:

10/01/98 21:44:31 (24 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

082fc2d

Parents:

f0bca9fb

Message:

Patch from Ian Lance Taylor <ian@…>:

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.

Files:

: 3 edited

c/src/exec/libcsupport/src/malloc.c (modified) (3 diffs)
c/src/lib/libc/malloc.c (modified) (3 diffs)
cpukit/libcsupport/src/malloc.c (modified) (3 diffs)

Legend:

: Unmodified
: Added
: Removed

c/src/exec/libcsupport/src/malloc.c

-                      rf0bca9fb
+                      r388be68f
 #ifdef RTEMS_NEWLIB
 void *malloc_r(
+void *_malloc_r(
   struct _reent *ignored,
   size_t  size
 …
+}
+void *calloc_r(
+void *_calloc_r(
+  struct _reent *ignored,
   size_t nelem,
   size_t elsize
 …
+}
+void *realloc_r(
+void *_realloc_r(
+  struct _reent *ignored,
   void *ptr,
   size_t size
+)
+{
+  return realloc_r( ptr, size );
+}
+void free_r(
+  return realloc( ptr, size );
+}
+void _free_r(
+  struct _reent *ignored,
   void *ptr
+)

c/src/lib/libc/malloc.c

-                      rf0bca9fb
+                      r388be68f
 #ifdef RTEMS_NEWLIB
 void *malloc_r(
+void *_malloc_r(
   struct _reent *ignored,
   size_t  size
 …
+}
+void *calloc_r(
+void *_calloc_r(
+  struct _reent *ignored,
   size_t nelem,
   size_t elsize
 …
+}
+void *realloc_r(
+void *_realloc_r(
+  struct _reent *ignored,
   void *ptr,
   size_t size
+)
+{
+  return realloc_r( ptr, size );
+}
+void free_r(
+  return realloc( ptr, size );
+}
+void _free_r(
+  struct _reent *ignored,
   void *ptr
+)

cpukit/libcsupport/src/malloc.c

-                      rf0bca9fb
+                      r388be68f
 #ifdef RTEMS_NEWLIB
 void *malloc_r(
+void *_malloc_r(
   struct _reent *ignored,
   size_t  size
 …
+}
+void *calloc_r(
+void *_calloc_r(
+  struct _reent *ignored,
   size_t nelem,
   size_t elsize
 …
+}
+void *realloc_r(
+void *_realloc_r(
+  struct _reent *ignored,
   void *ptr,
   size_t size
+)
+{
+  return realloc_r( ptr, size );
+}
+void free_r(
+  return realloc( ptr, size );
+}
+void _free_r(
+  struct _reent *ignored,
   void *ptr
+)

Note: See TracChangeset for help on using the changeset viewer.