diff options
| author | Christopher Faylor <me@cgf.cx> | 2002-11-13 04:20:31 +0300 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2002-11-13 04:20:31 +0300 |
| commit | e91ec2e3e6fbe82b6b481305a15aec370006baf0 (patch) | |
| tree | be7560643b8217bebc95d6516768a6cf5a206619 | |
| parent | e0900ffdb5a77455dcca22e60b69dc803c7d42e0 (diff) | |
* libc/stdlib/malign.c: Don't compile if MALLOC_PROVIDED.
* libc/stdlib/mlock.c: Ditto.
* libc/stdlib/msize.c: Ditto.
* libc/stdlib/msize.c: Ditto.
* libc/stdlib/mtrim.c: Ditto.
* libc/stdlib/valloc.c: Ditto.
| -rw-r--r-- | newlib/ChangeLog | 9 | ||||
| -rw-r--r-- | newlib/libc/stdlib/malign.c | 2 | ||||
| -rw-r--r-- | newlib/libc/stdlib/mlock.c | 2 | ||||
| -rw-r--r-- | newlib/libc/stdlib/msize.c | 2 | ||||
| -rw-r--r-- | newlib/libc/stdlib/mtrim.c | 2 | ||||
| -rw-r--r-- | newlib/libc/stdlib/valloc.c | 2 |
6 files changed, 19 insertions, 0 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index df54f0d8d..ce11aa573 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,12 @@ +2002-11-06 Christopher Faylor <cgf@redhat.com> + + * libc/stdlib/malign.c: Don't compile if MALLOC_PROVIDED. + * libc/stdlib/mlock.c: Ditto. + * libc/stdlib/msize.c: Ditto. + * libc/stdlib/msize.c: Ditto. + * libc/stdlib/mtrim.c: Ditto. + * libc/stdlib/valloc.c: Ditto. + 2002-11-12 Jeff Johnston <jjohnstn@redhat.com> * libc/stdlib/ldtoa.c (e64toe): When checking the exponent diff --git a/newlib/libc/stdlib/malign.c b/newlib/libc/stdlib/malign.c index d012d9be2..1eded306b 100644 --- a/newlib/libc/stdlib/malign.c +++ b/newlib/libc/stdlib/malign.c @@ -1,3 +1,4 @@ +#ifndef MALLOC_PROVIDED /* malign.c -- a wrapper for memalign_r. */ #include <_ansi.h> @@ -16,3 +17,4 @@ _DEFUN (memalign, (align, nbytes), } #endif +#endif diff --git a/newlib/libc/stdlib/mlock.c b/newlib/libc/stdlib/mlock.c index 485d0d5c9..c603fbcda 100644 --- a/newlib/libc/stdlib/mlock.c +++ b/newlib/libc/stdlib/mlock.c @@ -1,3 +1,4 @@ +#ifndef MALLOC_PROVIDED /* FUNCTION <<__malloc_lock>>, <<__malloc_unlock>>--lock malloc pool @@ -48,3 +49,4 @@ __malloc_unlock (ptr) struct _reent *ptr; { } +#endif diff --git a/newlib/libc/stdlib/msize.c b/newlib/libc/stdlib/msize.c index e910c44ec..e33e4aa37 100644 --- a/newlib/libc/stdlib/msize.c +++ b/newlib/libc/stdlib/msize.c @@ -1,3 +1,4 @@ +#ifndef MALLOC_PROVIDED /* msize.c -- a wrapper for malloc_usable_size. */ #include <_ansi.h> @@ -15,3 +16,4 @@ _DEFUN (malloc_usable_size, (ptr), } #endif +#endif diff --git a/newlib/libc/stdlib/mtrim.c b/newlib/libc/stdlib/mtrim.c index f5e0401c0..328eb715e 100644 --- a/newlib/libc/stdlib/mtrim.c +++ b/newlib/libc/stdlib/mtrim.c @@ -1,3 +1,4 @@ +#ifndef MALLOC_PROVIDED /* mtrim.c -- a wrapper for malloc_trim. */ #include <_ansi.h> @@ -15,3 +16,4 @@ _DEFUN (malloc_trim, (pad), } #endif +#endif diff --git a/newlib/libc/stdlib/valloc.c b/newlib/libc/stdlib/valloc.c index 42c09a054..26a44df44 100644 --- a/newlib/libc/stdlib/valloc.c +++ b/newlib/libc/stdlib/valloc.c @@ -1,3 +1,4 @@ +#ifndef MALLOC_PROVIDED /* valloc.c -- a wrapper for valloc_r and pvalloc_r. */ #include <_ansi.h> @@ -22,3 +23,4 @@ _DEFUN (pvalloc, (nbytes), } #endif +#endif |